diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-09-16 13:51:15 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-09-16 13:51:15 +0200 |
| commit | 970ce1e1626c205302c4085610819571c1ce79f4 (patch) | |
| tree | 76884f2cca1067f0ca90a397ae75fddb257f6d6e /indra/llcommon/CMakeLists.txt | |
| parent | 1dbcc3fff79b55038178e493df0cc0c3a4d66221 (diff) | |
| parent | 58c08f7c2cc33c4bf9ef688f0d4a87909ebb9250 (diff) | |
Merged VWR-23047 (SNOW-512, -fPIC for 64bit) and follow-ups (VWR-20911 & SNOW-748)
Diffstat (limited to 'indra/llcommon/CMakeLists.txt')
| -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 2a036df06e..78549bfcba 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -251,8 +251,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) |