diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-13 10:53:10 -0400 |
| commit | 7bb74afb67770fb8a02543a5e3a02a9b6d65bc57 (patch) | |
| tree | d12b00a2308b0fe000b2eaeb3529b31eeb0c2762 /indra/llcommon | |
| parent | a351c5005eebb03a03f0e79d2efcc5a304fab481 (diff) | |
| parent | 41484c19eeb534330a17aff7e7b6663b86198cfe (diff) | |
Automated merge with ssh://bitbucket.org/merov_linden/viewer-development-storm-137
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) |