diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-07-09 19:51:28 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-07-09 19:51:28 -0700 |
| commit | 9e399d5d3c7348012bcb79557d8a055f96b32e90 (patch) | |
| tree | 1f8c4df78c0bcd9267f2f89d054a4a87bbb1de20 | |
| parent | 632da0b99eb4af27f4e8600e1493a07500452fea (diff) | |
Brad already added the LLCOMMON_LINK_SHARED definition. I removed the broken one I added and set the other one to ON by default.
| -rw-r--r-- | indra/cmake/LLCommon.cmake | 2 | ||||
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/indra/cmake/LLCommon.cmake b/indra/cmake/LLCommon.cmake index 4cd3a9adb8..19d61008da 100644 --- a/indra/cmake/LLCommon.cmake +++ b/indra/cmake/LLCommon.cmake @@ -17,7 +17,7 @@ set(LLCOMMON_LIBRARIES llcommon) add_definitions(${TCMALLOC_FLAG}) -set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a shared library.") +set(LLCOMMON_LINK_SHARED ON CACHE BOOL "Build the llcommon target as a shared library.") if(LLCOMMON_LINK_SHARED) add_definitions(-DLL_COMMON_LINK_SHARED=1) endif(LLCOMMON_LINK_SHARED) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 7075590f60..aaeb4eebc3 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -235,7 +235,6 @@ set_source_files_properties(${llcommon_HEADER_FILES} list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) -set(LLCOMMON_LINK_SHARED ON) if(LLCOMMON_LINK_SHARED) add_library (llcommon SHARED ${llcommon_SOURCE_FILES}) add_definitions(-DLL_COMMON_BUILD=1) |