diff options
| author | Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius) <hg@boroon.dasgupta.ch> | 2010-09-16 13:26:45 +0200 |
|---|---|---|
| committer | Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius) <hg@boroon.dasgupta.ch> | 2010-09-16 13:26:45 +0200 |
| commit | 88e7a631b3e4c3d63aa80fe9b3e7f2595d3f45f8 (patch) | |
| tree | 8697a88d56b141c843312d956f268b8d6329a867 /indra/llplugin | |
| parent | 18bdeb3d0e5ef4e5b014b41a8003569061e00910 (diff) | |
SNOW-512/SNOW-287: Build of LLPlugin fails on 64bit linux due to non PIC code linking into the DSO
Formatting, cleanup, and one minor change by Techwolf Lupindo.
Minor change was a move of the hunk in
indra/media_plugins/webkit/CmakeLists.txt to same area as the other plugins CmakeLists.txt files.
daggyfied version of https://bitbucket.org/Techwolf/viewer-development/changeset/00bd21962052
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt index 6706775d4f..d9b623d5c0 100644 --- a/indra/llplugin/CMakeLists.txt +++ b/indra/llplugin/CMakeLists.txt @@ -48,6 +48,14 @@ set(llplugin_HEADER_FILES set_source_files_properties(${llplugin_HEADER_FILES} PROPERTIES HEADER_FILE_ONLY TRUE) +if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + if(WINDOWS) + add_definitions(/FIXED:NO) + else(WINDOWS) # not windows therefore gcc LINUX and DARWIN + add_definitions(-fPIC) + endif(WINDOWS) +endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES}) add_library (llplugin ${llplugin_SOURCE_FILES}) |