Skip to content
Snippets Groups Projects

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
parent 18bdeb3d
No related branches found
No related tags found
No related merge requests found
...@@ -502,6 +502,8 @@ Ringo Tuxing ...@@ -502,6 +502,8 @@ Ringo Tuxing
Robin Cornelius Robin Cornelius
SNOW-108 SNOW-108
SNOW-204 SNOW-204
SNOW-287
SNOW-512
VWR-2488 VWR-2488
VWR-9557 VWR-9557
VWR-11128 VWR-11128
......
...@@ -250,6 +250,13 @@ list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) ...@@ -250,6 +250,13 @@ list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
if(LLCOMMON_LINK_SHARED) if(LLCOMMON_LINK_SHARED)
add_library (llcommon SHARED ${llcommon_SOURCE_FILES}) add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
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)
ll_stage_sharedlib(llcommon) ll_stage_sharedlib(llcommon)
else(LLCOMMON_LINK_SHARED) else(LLCOMMON_LINK_SHARED)
add_library (llcommon ${llcommon_SOURCE_FILES}) add_library (llcommon ${llcommon_SOURCE_FILES})
......
...@@ -48,6 +48,14 @@ set(llplugin_HEADER_FILES ...@@ -48,6 +48,14 @@ set(llplugin_HEADER_FILES
set_source_files_properties(${llplugin_HEADER_FILES} set_source_files_properties(${llplugin_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE) 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}) list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
add_library (llplugin ${llplugin_SOURCE_FILES}) add_library (llplugin ${llplugin_SOURCE_FILES})
......
...@@ -25,6 +25,14 @@ include_directories( ...@@ -25,6 +25,14 @@ include_directories(
### media_plugin_base ### media_plugin_base
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)
set(media_plugin_base_SOURCE_FILES set(media_plugin_base_SOURCE_FILES
media_plugin_base.cpp media_plugin_base.cpp
) )
......
...@@ -29,6 +29,14 @@ include_directories( ...@@ -29,6 +29,14 @@ include_directories(
### media_plugin_example ### media_plugin_example
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)
set(media_plugin_example_SOURCE_FILES set(media_plugin_example_SOURCE_FILES
media_plugin_example.cpp media_plugin_example.cpp
) )
......
...@@ -30,6 +30,14 @@ include_directories( ...@@ -30,6 +30,14 @@ include_directories(
### media_plugin_gstreamer010 ### media_plugin_gstreamer010
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)
set(media_plugin_gstreamer010_SOURCE_FILES set(media_plugin_gstreamer010_SOURCE_FILES
media_plugin_gstreamer010.cpp media_plugin_gstreamer010.cpp
llmediaimplgstreamer_syms.cpp llmediaimplgstreamer_syms.cpp
......
...@@ -29,6 +29,14 @@ include_directories( ...@@ -29,6 +29,14 @@ include_directories(
### media_plugin_webkit ### media_plugin_webkit
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)
set(media_plugin_webkit_SOURCE_FILES set(media_plugin_webkit_SOURCE_FILES
media_plugin_webkit.cpp media_plugin_webkit.cpp
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment