diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-12 17:32:56 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-12 17:32:56 -0400 |
| commit | 93d31d9bfea91d2d5917ea117cef18f82b2a668f (patch) | |
| tree | 3d98f550d354d3c453c3d03165e986103062a49e /indra/llplugin | |
| parent | f36085b0de9c3c557fd33492312abbbbea6e26a2 (diff) | |
| parent | 8269d4d51cd58fa5c8fc4ac22d9f42041849889d (diff) | |
merge fixes for STORM-374
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/llplugin/slplugin/CMakeLists.txt | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index fdd510b389..d3a73058c4 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -51,6 +51,14 @@ set(llplugin_HEADER_FILES set_source_files_properties(${llplugin_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) +if(NOT WORD_SIZE EQUAL 32) + if(WINDOWS) + add_definitions(/FIXED:NO) + else(WINDOWS) # not windows therefore gcc LINUX and DARWIN + add_definitions(-fPIC) + endif(WINDOWS) +endif(NOT WORD_SIZE EQUAL 32) + list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES}) add_library (llplugin ${llplugin_SOURCE_FILES}) diff --git a/indra/llplugin/slplugin/CMakeLists.txt b/indra/llplugin/slplugin/CMakeLists.txt index 08d35f9ae7..3fc54573a7 100644 --- a/indra/llplugin/slplugin/CMakeLists.txt +++ b/indra/llplugin/slplugin/CMakeLists.txt @@ -79,4 +79,6 @@ if (DARWIN) ) endif (DARWIN) -ll_deploy_sharedlibs_command(SLPlugin) +if (LL_TESTS) + ll_deploy_sharedlibs_command(SLPlugin) +endif (LL_TESTS) |