diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:18:16 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:18:16 -0400 |
| commit | 4e538adca41d486125c3b887ce694c457bcab157 (patch) | |
| tree | 11e11e8b415dbc423b329a8d1585d2f87e47634d /indra/cmake/LLSharedLibs.cmake | |
| parent | c2b1bf6a0d7fbcadc81ef375fd8f2a9944758e64 (diff) | |
EXT-7926: fix broken LD_LIBRARY_PATH handling on Windows.
Recent checkins introduced two different CMake macros SET_TEST_LIST (which
returned a CMake list of PATH directory strings) and SET_TEST_PATH (which
returned a single platform-appropriate PATH string). On Windows, whose
path-separator character is ';', SET_TEST_PATH interacted badly with CMake: in
CMake, a single string containing ';' characters is indistinguishable from a
list of strings.
Eliminate the return-single-string form, redirecting the name SET_TEST_PATH to
the macro that returns a CMake list. Make LL_TEST_COMMAND expect a list value,
prepending each directory string with run_build_test.py's -l switch.
Diffstat (limited to 'indra/cmake/LLSharedLibs.cmake')
| -rw-r--r-- | indra/cmake/LLSharedLibs.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/cmake/LLSharedLibs.cmake b/indra/cmake/LLSharedLibs.cmake index b32a46b736..009eeae781 100644 --- a/indra/cmake/LLSharedLibs.cmake +++ b/indra/cmake/LLSharedLibs.cmake @@ -5,7 +5,7 @@ macro(ll_deploy_sharedlibs_command target_exe) get_filename_component(OUTPUT_PATH ${TARGET_LOCATION} PATH) if(DARWIN) - SET_TEST_LIST(SEARCH_DIRS) + SET_TEST_PATH(SEARCH_DIRS) get_target_property(IS_BUNDLE ${target_exe} MACOSX_BUNDLE) if(IS_BUNDLE) # If its a bundle the exe is not in the target location, this should find it. @@ -15,10 +15,10 @@ macro(ll_deploy_sharedlibs_command target_exe) set(OUTPUT_PATH ${OUTPUT_PATH}/../Resources) endif(IS_BUNDLE) elseif(WINDOWS) - SET_TEST_LIST(SEARCH_DIRS) + SET_TEST_PATH(SEARCH_DIRS) LIST(APPEND SEARCH_DIRS "$ENV{SystemRoot}/system32") elseif(LINUX) - SET_TEST_LIST(SEARCH_DIRS) + SET_TEST_PATH(SEARCH_DIRS) set(OUTPUT_PATH ${OUTPUT_PATH}/lib) endif(DARWIN) @@ -72,4 +72,4 @@ macro(ll_stage_sharedlib DSO_TARGET) ) endif(DARWIN) -endmacro(ll_stage_sharedlib)
\ No newline at end of file +endmacro(ll_stage_sharedlib) |