Merge branch 'master' of https://github.com/RouterGray/SingularityViewer

2019-12-27 20:19:49 -05:00
parent e6e6d811c6 c8290b913e
commit 8a6f5b49a3
21 changed files with 55 additions and 141 deletions
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2771,7 +2771,7 @@
                <key>options</key>
                <array>
                  <string>-DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo</string>
-                  <string>-DWORD_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
+                  <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                  <string>-DROOT_PROJECT_NAME:STRING=Singularity</string>
                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
                </array>
@@ -2792,7 +2792,7 @@
                <key>options</key>
                <array>
                  <string>-DCMAKE_BUILD_TYPE:STRING=Release</string>
-                  <string>-DWORD_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
+                  <string>-DADDRESS_SIZE:STRING=$AUTOBUILD_ADDRSIZE</string>
                  <string>-DROOT_PROJECT_NAME:STRING=Singularity</string>
                  <string>-DINSTALL_PROPRIETARY=FALSE</string>
                </array>
@@ -2943,7 +2943,7 @@
                <array>
                  <string>-G</string>
                  <string>Ninja</string>
-                  <string>-DWORD_SIZE:STRING=64</string>
+                  <string>-DADDRESS_SIZE:STRING=64</string>
                </array>
              </map>
              <key>default</key>
@@ -2968,7 +2968,7 @@
                <array>
                  <string>-G</string>
                  <string>Ninja</string>
-                  <string>-DWORD_SIZE:STRING=64</string>
+                  <string>-DADDRESS_SIZE:STRING=64</string>
                </array>
              </map>
              <key>name</key>
@@ -3068,7 +3068,7 @@
            </map>
          </map>
          <key>name</key>
-          <string>windows64</string>
+          <string>windows</string>
        </map>
      </map>
      <key>version_file</key>
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -39,9 +39,9 @@ if (WINDOWS)
      "${CMAKE_C_FLAGS_RELEASE} ${LL_C_FLAGS} /O2 /Zi /MD /MP /fp:fast"
      CACHE STRING "C compiler release options" FORCE)

-  if (WORD_SIZE EQUAL 32)
+  if (ADDRESS_SIZE EQUAL 32)
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
-  endif (WORD_SIZE EQUAL 32)
+  endif (ADDRESS_SIZE EQUAL 32)

  if (FULL_DEBUG_SYMS OR USE_CRASHPAD)
    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG:FULL")
@@ -103,9 +103,9 @@ if (WINDOWS)
        )
  endif (USE_LTO)

-  if (WORD_SIZE EQUAL 32)
+  if (ADDRESS_SIZE EQUAL 32)
    add_compile_options(/arch:SSE2)
-  endif (WORD_SIZE EQUAL 32)
+  endif (ADDRESS_SIZE EQUAL 32)

  if (NOT DISABLE_FATAL_WARNINGS)
    add_definitions(/WX)
@@ -292,13 +292,13 @@ if (LINUX OR DARWIN)

  set(CMAKE_C_FLAGS "${UNIX_WARNINGS} ${CMAKE_C_FLAGS}")
  set(CMAKE_CXX_FLAGS "${UNIX_CXX_WARNINGS} ${CMAKE_CXX_FLAGS}")
-  if (WORD_SIZE EQUAL 32)
+  if (ADDRESS_SIZE EQUAL 32)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
-  elseif (WORD_SIZE EQUAL 64)
+  elseif (ADDRESS_SIZE EQUAL 64)
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64")
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64")
-  endif (WORD_SIZE EQUAL 32)
+  endif (ADDRESS_SIZE EQUAL 32)
 endif (LINUX OR DARWIN)


--- a/indra/cmake/ConfigurePkgConfig.cmake
+++ b/indra/cmake/ConfigurePkgConfig.cmake
@@ -6,17 +6,17 @@ SET(DEBUG_PKG_CONFIG "YES")
 IF("$ENV{PKG_CONFIG_LIBDIR}" STREQUAL "")

  # Guess at architecture-specific system library paths.
-  if (WORD_SIZE EQUAL 32)
+  if (ADDRESS_SIZE EQUAL 32)
    SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib32 /usr/lib)
    SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib32 /usr/local/lib)
    SET(PKG_CONFIG_MULTI_GUESS /usr/lib/i386-linux-gnu)
    SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/i386-linux-gnu)
-  else (WORD_SIZE EQUAL 32)
+  else (ADDRESS_SIZE EQUAL 32)
    SET(PKG_CONFIG_NO_MULTI_GUESS /usr/lib64 /usr/lib)
    SET(PKG_CONFIG_NO_MULTI_LOCAL_GUESS /usr/local/lib64 /usr/local/lib)
    SET(PKG_CONFIG_MULTI_GUESS /usr/lib/x86_64-linux-gnu)
    SET(PKG_CONFIG_MULTI_LOCAL_GUESS /usr/local/lib/x86_64-linux-gnu)
-  endif (WORD_SIZE EQUAL 32)
+  endif (ADDRESS_SIZE EQUAL 32)
  
  # Use DPKG architecture, if available.
  IF (${DPKG_ARCH})
--- a/indra/cmake/GooglePerfTools.cmake
+++ b/indra/cmake/GooglePerfTools.cmake
@@ -2,16 +2,16 @@

 include(Prebuilt)

-if(WORD_SIZE EQUAL 64)
+if(ADDRESS_SIZE EQUAL 64)
  set(DISABLE_TCMALLOC TRUE)
-endif(WORD_SIZE EQUAL 64)
+endif(ADDRESS_SIZE EQUAL 64)

 if (STANDALONE)
  include(FindGooglePerfTools)
 else (STANDALONE)
-  if (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
+  if (LINUX OR WINDOWS AND NOT ADDRESS_SIZE EQUAL 64)
    use_prebuilt_binary(gperftools)
-  endif (LINUX OR WINDOWS AND NOT WORD_SIZE EQUAL 64)
+  endif (LINUX OR WINDOWS AND NOT ADDRESS_SIZE EQUAL 64)
  if (WINDOWS AND NOT DISABLE_TCMALLOC)
    set(TCMALLOC_LIBRARIES libtcmalloc_minimal.lib)
    set(TCMALLOC_LINKER_FLAGS "/INCLUDE:\"__tcmalloc\"")
--- a/indra/cmake/LLCommon.cmake
+++ b/indra/cmake/LLCommon.cmake
@@ -10,7 +10,6 @@ if (DARWIN)
  find_library(CORESERVICES_LIBRARY CoreServices)
 endif (DARWIN)

-
 set(LLCOMMON_INCLUDE_DIRS
    ${LIBS_OPEN_DIR}/cwdebug
    ${LIBS_OPEN_DIR}/llcommon
@@ -19,14 +18,7 @@ set(LLCOMMON_INCLUDE_DIRS
    ${Boost_INCLUDE_DIRS}
    )

-if (LINUX)
-    # In order to support using ld.gold on linux, we need to explicitely
-    # specify all libraries that llcommon uses.
-    # llcommon uses `clock_gettime' which is provided by librt on linux.
-    set(LLCOMMON_LIBRARIES llcommon rt)
-else (LINUX)
-    set(LLCOMMON_LIBRARIES llcommon)
-endif (LINUX)
+set(LLCOMMON_LIBRARIES llcommon)

 set(LLCOMMON_LINK_SHARED OFF CACHE BOOL "Build the llcommon target as a shared library.")
 if(LLCOMMON_LINK_SHARED)
--- a/indra/cmake/LLPlugin.cmake
+++ b/indra/cmake/LLPlugin.cmake
@@ -5,10 +5,4 @@ set(LLPLUGIN_INCLUDE_DIRS
    ${LIBS_OPEN_DIR}/llplugin
    )

-if (LINUX)
-    # In order to support using ld.gold on linux, we need to explicitely
-    # specify all libraries that llplugin uses.
-    set(LLPLUGIN_LIBRARIES llplugin pthread)
-else (LINUX)
-    set(LLPLUGIN_LIBRARIES llplugin)
-endif (LINUX)
+set(LLPLUGIN_LIBRARIES llplugin)
--- a/indra/cmake/NVAPI.cmake
+++ b/indra/cmake/NVAPI.cmake
@@ -5,11 +5,11 @@ include(Variables)
 if (USE_NVAPI)
  if (WINDOWS)
    use_prebuilt_binary(nvapi)
-    if (WORD_SIZE EQUAL 32)
+    if (ADDRESS_SIZE EQUAL 32)
      set(NVAPI_LIBRARY nvapi)
-    elseif (WORD_SIZE EQUAL 64)
+    elseif (ADDRESS_SIZE EQUAL 64)
      set(NVAPI_LIBRARY nvapi64)
-    endif (WORD_SIZE EQUAL 32)	
+    endif (ADDRESS_SIZE EQUAL 32)	
  else (WINDOWS)
    set(NVAPI_LIBRARY "")
  endif (WINDOWS)
--- a/indra/cmake/Variables.cmake
+++ b/indra/cmake/Variables.cmake
@@ -119,7 +119,6 @@ endif (NOT CMAKE_BUILD_TYPE)

 # If someone has specified an address size, use that to determine the
 # architecture.  Otherwise, let the architecture specify the address size.
-set(ADDRESS_SIZE ${WORD_SIZE})
 if (ADDRESS_SIZE EQUAL 32)
  #message(STATUS "ADDRESS_SIZE is 32")
  set(ARCH i686)
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -269,12 +269,6 @@ list(APPEND llcommon_SOURCE_FILES ${cwdebug_SOURCE_FILES})

 list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})

-if(NOT WORD_SIZE EQUAL 32)
-  if(NOT WINDOWS)
-    add_definitions(-fPIC)
-  endif(NOT WINDOWS)
-endif(NOT WORD_SIZE EQUAL 32)
-
 if(LLCOMMON_LINK_SHARED)
  add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
  if(WINDOWS)
@@ -286,6 +280,8 @@ else(LLCOMMON_LINK_SHARED)
    add_library (llcommon ${llcommon_SOURCE_FILES})
 endif(LLCOMMON_LINK_SHARED)

+set_target_properties(llcommon PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
 target_link_libraries(
    llcommon
    PUBLIC
@@ -304,6 +300,7 @@ target_link_libraries(
    ${Boost_SYSTEM_LIBRARY}
    ${CORESERVICES_LIBRARY}
    ${URIPARSER_LIBRARY}
+    ${RT_LIBRARY}
    )

 if (DARWIN)
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -227,7 +227,8 @@ target_link_libraries(
  ${OPENSSL_LIBRARIES}
  ${CRYPTO_LIBRARIES}
  ${XMLRPCEPI_LIBRARIES}
-  )
+  ${PTHREAD_LIBRARY}
+)

 # tests
 if (LL_TESTS)
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -7,6 +7,7 @@ include(LLCommon)
 include(LLMath)
 include(LLMessage)
 include(LLRender)
+include(Boost)

 include_directories(
    ${LLCOMMON_INCLUDE_DIRS}
@@ -46,14 +47,6 @@ set(llplugin_HEADER_FILES
 set_source_files_properties(${llplugin_HEADER_FILES}
                            PROPERTIES HEADER_FILE_ONLY TRUE)

-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)
-
 list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})

 add_library (llplugin ${llplugin_SOURCE_FILES})
@@ -67,6 +60,8 @@ else()
        )
 endif()

+set_target_properties(llplugin PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
 add_subdirectory(slplugin)

 # # Add tests
--- a/indra/llplugin/slplugin/CMakeLists.txt
+++ b/indra/llplugin/slplugin/CMakeLists.txt
@@ -1,7 +1,6 @@
 project(SLPlugin)

 include(00-Common)
-include(Linking)
 include(LLCommon)
 include(LLPlugin)
 include(Linking)
@@ -69,12 +68,7 @@ target_link_libraries(SLPlugin
  ${LLCOMMON_LIBRARIES}
  ${APRUTIL_LIBRARIES}
  ${PLUGIN_API_WINDOWS_LIBRARIES}
-)
-
-add_dependencies(SLPlugin
-  ${LLPLUGIN_LIBRARIES}
-  ${LLMESSAGE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
+  ${PTHREAD_LIBRARY}
 )

 if (DARWIN)
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1532,18 +1532,18 @@ if (WINDOWS)
    endif (ADDRESS_SIZE EQUAL 64)

    if (USE_FMODSTUDIO)
-      if (WORD_SIZE EQUAL 64)
+      if (ADDRESS_SIZE EQUAL 64)
        list(APPEND COPY_INPUT_DEPENDENCIES
             ${SHARED_LIB_STAGING_DIR}/Release/fmod64.dll
             ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod64.dll
             ${SHARED_LIB_STAGING_DIR}/Debug/fmodL64.dll
            )
-      else (WORD_SIZE EQUAL 64)
+      else (ADDRESS_SIZE EQUAL 64)
        list(APPEND COPY_INPUT_DEPENDENCIES
             ${SHARED_LIB_STAGING_DIR}/Release/fmod.dll
             ${SHARED_LIB_STAGING_DIR}/RelWithDebInfo/fmod.dll
            )
-      endif (WORD_SIZE EQUAL 64)
+      endif (ADDRESS_SIZE EQUAL 64)
    endif (USE_FMODSTUDIO)

    if(MSVC_IDE)
--- a/indra/plugins/CMakeLists.txt
+++ b/indra/plugins/CMakeLists.txt
@@ -1,5 +1,7 @@
 # -*- cmake -*-

+include(Variables)
+
 add_subdirectory(base_basic)
 add_subdirectory(base_media)
 add_subdirectory(filepicker)
--- a/indra/plugins/base_basic/CMakeLists.txt
+++ b/indra/plugins/base_basic/CMakeLists.txt
@@ -15,14 +15,6 @@ include_directories(

 ### basic_plugin_base

-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)
-
 set(basic_plugin_base_SOURCE_FILES
    basic_plugin_base.cpp
 )
@@ -42,6 +34,8 @@ add_library(basic_plugin_base
    ${basic_plugin_base_SOURCE_FILES}
 )

+set_target_properties(basic_plugin_base PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
 target_link_libraries(basic_plugin_base
    PUBLIC
    llcommon
--- a/indra/plugins/base_media/CMakeLists.txt
+++ b/indra/plugins/base_media/CMakeLists.txt
@@ -29,14 +29,6 @@ include_directories(

 ### media_plugin_base

-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)
-
 set(media_plugin_base_SOURCE_FILES
    media_plugin_base.cpp
 )
@@ -56,6 +48,8 @@ add_library(media_plugin_base
    ${media_plugin_base_SOURCE_FILES}
 )

+set_target_properties(media_plugin_base PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
 target_link_libraries(media_plugin_base
    PUBLIC
    llcommon
--- a/indra/plugins/cef/CMakeLists.txt
+++ b/indra/plugins/cef/CMakeLists.txt
@@ -2,6 +2,7 @@

 project(media_plugin_cef)

+include(Boost)
 include(00-Common)
 include(LLCommon)
 include(LLImage)
@@ -14,6 +15,7 @@ include(PluginAPI)
 include(MediaPluginBase)
 include(OpenGL)
 include(PulseAudio)
+include(UI)

 include(CEFPlugin)

@@ -35,12 +37,6 @@ include_directories(SYSTEM

 ### media_plugin_cef

-if(NOT WORD_SIZE EQUAL 32)
-  if(NOT WINDOWS) # not windows therefore gcc LINUX and DARWIN
-    add_definitions(-fPIC)
-  endif(NOT WINDOWS)
-endif(NOT WORD_SIZE EQUAL 32)
-
 set(media_plugin_cef_SOURCE_FILES
    media_plugin_cef.cpp
    )
@@ -52,11 +48,10 @@ set(media_plugin_cef_HEADER_FILES
 set (media_plugin_cef_LINK_LIBRARIES
  ${LLPLUGIN_LIBRARIES}
  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
  ${CEF_PLUGIN_LIBRARIES}
+  ${LLCOMMON_LIBRARIES}
  ${PLUGIN_API_WINDOWS_LIBRARIES})

-
 # Select which VolumeCatcher implementation to use
 if (LINUX)
  if (PULSEAUDIO_FOUND)
@@ -89,11 +84,7 @@ add_library(media_plugin_cef
    ${media_plugin_cef_SOURCE_FILES}
 )

-add_dependencies(media_plugin_cef
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
+set_target_properties(media_plugin_cef PROPERTIES POSITION_INDEPENDENT_CODE TRUE)

 target_link_libraries(media_plugin_cef
  ${media_plugin_cef_LINK_LIBRARIES}
--- a/indra/plugins/example_basic/CMakeLists.txt
+++ b/indra/plugins/example_basic/CMakeLists.txt
@@ -17,14 +17,6 @@ include_directories(

 ### basic_plugin_example

-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)
-
 set(basic_plugin_example_SOURCE_FILES
    basic_plugin_example.cpp
    )
@@ -34,13 +26,9 @@ add_library(basic_plugin_example
    ${basic_plugin_example_SOURCE_FILES}
 )

-target_link_libraries(basic_plugin_example
-  ${LLPLUGIN_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-  ${BASIC_PLUGIN_BASE_LIBRARIES}
-)
+set_target_properties(basic_plugin_example PROPERTIES POSITION_INDEPENDENT_CODE TRUE)

-add_dependencies(basic_plugin_example
+target_link_libraries(basic_plugin_example
  ${LLPLUGIN_LIBRARIES}
  ${LLCOMMON_LIBRARIES}
  ${BASIC_PLUGIN_BASE_LIBRARIES}
--- a/indra/plugins/example_media/CMakeLists.txt
+++ b/indra/plugins/example_media/CMakeLists.txt
@@ -28,14 +28,6 @@ include_directories(

 ### media_plugin_example

-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)
-
 set(media_plugin_example_SOURCE_FILES
    media_plugin_example.cpp
    )
@@ -45,6 +37,8 @@ add_library(media_plugin_example
    ${media_plugin_example_SOURCE_FILES}
 )

+set_target_properties(media_plugin_example PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
 target_link_libraries(media_plugin_example
  ${LLPLUGIN_LIBRARIES}
  ${MEDIA_PLUGIN_BASE_LIBRARIES}
@@ -53,12 +47,6 @@ target_link_libraries(media_plugin_example
  ${PLUGIN_API_WINDOWS_LIBRARIES}
 )

-add_dependencies(media_plugin_example
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
-
 if (WINDOWS)
  set_target_properties(
    media_plugin_example
--- a/indra/plugins/filepicker/CMakeLists.txt
+++ b/indra/plugins/filepicker/CMakeLists.txt
@@ -23,14 +23,6 @@ include_directories(

 ### basic_plugin_filepicker

-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)
-
 set(basic_plugin_filepicker_SOURCE_FILES
 	basic_plugin_filepicker.cpp
 	legacy.cpp
@@ -71,6 +63,8 @@ if (DARWIN)
  set(OSX_FILE_LIBRARIES ${APPKIT_LIBRARY} ${CARBON_LIBRARY} ${IOKIT_LIBRARY})
 endif (DARWIN)

+set_target_properties(basic_plugin_filepicker PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
 target_link_libraries(basic_plugin_filepicker
  ${LLPLUGIN_LIBRARIES}
  ${LLCOMMON_LIBRARIES}
@@ -80,12 +74,6 @@ target_link_libraries(basic_plugin_filepicker
  ${OSX_FILE_LIBRARIES}
 )

-add_dependencies(basic_plugin_filepicker
-  ${LLPLUGIN_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-  ${BASIC_PLUGIN_BASE_LIBRARIES}
-)
-
 if (WINDOWS)
  set_target_properties(
    basic_plugin_filepicker
--- a/indra/plugins/gstreamer010/CMakeLists.txt
+++ b/indra/plugins/gstreamer010/CMakeLists.txt
@@ -13,6 +13,7 @@ include(Linking)
 include(PluginAPI)
 include(MediaPluginBase)
 include(FindOpenGL)
+include(Boost)

 include(GStreamer010Plugin)

@@ -45,6 +46,8 @@ add_library(media_plugin_gstreamer010
    ${media_plugin_gstreamer010_SOURCE_FILES}
 )

+set_target_properties(media_plugin_gstreamer010 PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+
 target_link_libraries(media_plugin_gstreamer010
  ${LLPLUGIN_LIBRARIES}
  ${MEDIA_PLUGIN_BASE_LIBRARIES}
@@ -53,9 +56,3 @@ target_link_libraries(media_plugin_gstreamer010
  ${GSTREAMER010_LIBRARIES}
 )

-add_dependencies(media_plugin_gstreamer010
-  ${LLPLUGIN_LIBRARIES}
-  ${MEDIA_PLUGIN_BASE_LIBRARIES}
-  ${LLCOMMON_LIBRARIES}
-)
-