Browse Source

MagnumPlugins: respect BUILD_PLUGINS_STATIC and not BUILD_STATIC.

Also set dynamic-only properties only when building dynamic plugins.
pull/88/head
Vladimír Vondruš 11 years ago
parent
commit
ded991a74b
  1. 2
      src/MagnumPlugins/MagnumFont/CMakeLists.txt
  2. 2
      src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
  3. 2
      src/MagnumPlugins/ObjImporter/CMakeLists.txt
  4. 6
      src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
  5. 8
      src/MagnumPlugins/TgaImporter/CMakeLists.txt
  6. 2
      src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

2
src/MagnumPlugins/MagnumFont/CMakeLists.txt

@ -31,7 +31,7 @@ set(MagnumFont_HEADERS
# Objects shared between plugin and test library
add_library(MagnumFontObjects OBJECT ${MagnumFont_SRCS})
if(NOT BUILD_STATIC OR BUILD_STATIC_PIC)
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(MagnumFontObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()

2
src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt

@ -31,7 +31,7 @@ set(MagnumFontConverter_HEADERS
# Objects shared between plugin and test library
add_library(MagnumFontConverterObjects OBJECT ${MagnumFontConverter_SRCS})
if(NOT BUILD_STATIC OR BUILD_STATIC_PIC)
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(MagnumFontConverterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()

2
src/MagnumPlugins/ObjImporter/CMakeLists.txt

@ -33,7 +33,7 @@ set(ObjImporter_HEADERS
add_library(ObjImporterObjects OBJECT
${ObjImporter_SRCS}
${ObjImporter_HEADERS})
if(NOT BUILD_STATIC OR BUILD_STATIC_PIC)
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(ObjImporterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()

6
src/MagnumPlugins/TgaImageConverter/CMakeLists.txt

@ -33,8 +33,10 @@ set(TgaImageConverter_HEADERS
add_library(TgaImageConverterObjects OBJECT
${TgaImageConverter_SRCS}
${TgaImageConverter_HEADERS})
set_target_properties(TgaImageConverterObjects PROPERTIES COMPILE_FLAGS "-DTgaImageConverterObjects_EXPORTS")
if(NOT BUILD_STATIC OR BUILD_STATIC_PIC)
if(NOT BUILD_PLUGINS_STATIC)
set_target_properties(TgaImageConverterObjects PROPERTIES COMPILE_FLAGS "-DTgaImageConverterObjects_EXPORTS")
endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(TgaImageConverterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()

8
src/MagnumPlugins/TgaImporter/CMakeLists.txt

@ -34,8 +34,10 @@ set(TgaImporter_HEADERS
add_library(TgaImporterObjects OBJECT
${TgaImporter_SRCS}
${TgaImporter_HEADERS})
set_target_properties(TgaImporterObjects PROPERTIES COMPILE_FLAGS "-DTgaImporterObjects_EXPORTS")
if(NOT BUILD_STATIC OR BUILD_STATIC_PIC)
if(NOT BUILD_PLUGINS_STATIC)
set_target_properties(TgaImporterObjects PROPERTIES COMPILE_FLAGS "-DTgaImporterObjects_EXPORTS")
endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(TgaImporterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
@ -44,7 +46,7 @@ add_plugin(TgaImporter ${MAGNUM_PLUGINS_IMPORTER_DEBUG_INSTALL_DIR} ${MAGNUM_PLU
TgaImporter.conf
$<TARGET_OBJECTS:TgaImporterObjects>
pluginRegistration.cpp)
if(NOT BUILD_STATIC OR BUILD_STATIC_PIC)
if(BUILD_STATIC_PIC)
set_target_properties(TgaImporter PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()

2
src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

@ -38,7 +38,7 @@ set(WavAudioImporter_HEADERS
add_library(WavAudioImporterObjects OBJECT
${WavAudioImporter_SRCS}
${WavAudioImporter_HEADERS})
if(NOT BUILD_STATIC OR BUILD_STATIC_PIC)
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(WavAudioImporterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()

Loading…
Cancel
Save