diff options
| author | palmer@945battery-guestB-224.lindenlab.com <palmer@945battery-guestB-224.lindenlab.com> | 2009-07-09 17:11:45 -0700 |
|---|---|---|
| committer | palmer@945battery-guestB-224.lindenlab.com <palmer@945battery-guestB-224.lindenlab.com> | 2009-07-09 17:11:45 -0700 |
| commit | 725de557ec1f8dfc3178edd3a19896473863e717 (patch) | |
| tree | 82180a22d83808b1bdaed3f25025ee4cc18bb4ec /indra/llcommon | |
| parent | bc852ca9276e19ce6cb75d189d58d783a7df5e6f (diff) | |
| parent | b5fef75dad1c0992c63ede83b96da0b1db1f9a37 (diff) | |
Merge of mani's changes... and who knows what. Mercurial wanted a merge, but I had no changes
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 06a295b410..aaeb4eebc3 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -9,6 +9,10 @@ include(Linking) include(Boost) include (Pth) +if (WINDOWS) + include(CopyWinLibs) +endif (WINDOWS) + include_directories( ${EXPAT_INCLUDE_DIRS} ${LLCOMMON_INCLUDE_DIRS} @@ -234,6 +238,10 @@ 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}) else(LLCOMMON_LINK_SHARED) add_library (llcommon ${llcommon_SOURCE_FILES}) endif(LLCOMMON_LINK_SHARED) @@ -250,6 +258,8 @@ target_link_libraries( ${PTH_LIBRARIES} ) +add_dependencies(llcommon stage_third_party_libs) + include(LLAddBuildTest) SET(llcommon_TEST_SOURCE_FILES # WARNING: Please don't write tests against LLCommon or LLMath until this issue is resolved: https://jira.lindenlab.com/jira/browse/DEV-29456 |