diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2009-07-15 13:55:09 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2009-07-15 13:55:09 -0700 |
| commit | 796ac35ca503090b3923c942df11f0153fd23693 (patch) | |
| tree | b2d0e4f5af060838f83b41fe227c1cad3bd9bf26 | |
| parent | 675ed878cffde81f5f7f371fa85abe652fde82c2 (diff) | |
Disable SHARED_LIB_STAGING_DIR usage on systems where it's not initialized.
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index cb0f6add21..c46e2583f1 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -238,10 +238,13 @@ list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) if(LLCOMMON_LINK_SHARED) add_library (llcommon SHARED ${llcommon_SOURCE_FILES}) add_definitions(-DLL_COMMON_BUILD=1) - # *FIX:Mani --- - # llcommon.dll get written to the DLL staging directory. - # Also this directory is shared with RunBuildTest.cmake, y'know, for the tests. - set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR}) + + if(SHARED_LIB_STAGING_DIR) + # *FIX:Mani --- + # llcommon.dll get written to the DLL staging directory. + # Also this directory is shared with RunBuildTest.cmake, y'know, for the tests. + set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR}) + endif(SHARED_LIB_STAGING_DIR) else(LLCOMMON_LINK_SHARED) add_library (llcommon ${llcommon_SOURCE_FILES}) endif(LLCOMMON_LINK_SHARED) |