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/llcommon | |
| parent | f36085b0de9c3c557fd33492312abbbbea6e26a2 (diff) | |
| parent | 8269d4d51cd58fa5c8fc4ac22d9f42041849889d (diff) | |
merge fixes for STORM-374
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 858e483036..902734906d 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -252,8 +252,15 @@ set_source_files_properties(${llcommon_HEADER_FILES} list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) if(LLCOMMON_LINK_SHARED) - add_library (llcommon SHARED ${llcommon_SOURCE_FILES}) - ll_stage_sharedlib(llcommon) + add_library (llcommon SHARED ${llcommon_SOURCE_FILES}) + 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) + ll_stage_sharedlib(llcommon) else(LLCOMMON_LINK_SHARED) add_library (llcommon ${llcommon_SOURCE_FILES}) endif(LLCOMMON_LINK_SHARED) |