diff --git a/src/MagnumPlugins/MagnumFont/CMakeLists.txt b/src/MagnumPlugins/MagnumFont/CMakeLists.txt index 77dc16a67..e91405250 100644 --- a/src/MagnumPlugins/MagnumFont/CMakeLists.txt +++ b/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() diff --git a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt b/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt index 0f5fc0f20..af66c6084 100644 --- a/src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt +++ b/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() diff --git a/src/MagnumPlugins/ObjImporter/CMakeLists.txt b/src/MagnumPlugins/ObjImporter/CMakeLists.txt index 40d8cf061..2fb9c018b 100644 --- a/src/MagnumPlugins/ObjImporter/CMakeLists.txt +++ b/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() diff --git a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt b/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt index 7aa7443cd..93f671bac 100644 --- a/src/MagnumPlugins/TgaImageConverter/CMakeLists.txt +++ b/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() diff --git a/src/MagnumPlugins/TgaImporter/CMakeLists.txt b/src/MagnumPlugins/TgaImporter/CMakeLists.txt index 5aa4b06fe..e09a210b2 100644 --- a/src/MagnumPlugins/TgaImporter/CMakeLists.txt +++ b/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 $ pluginRegistration.cpp) -if(NOT BUILD_STATIC OR BUILD_STATIC_PIC) +if(BUILD_STATIC_PIC) set_target_properties(TgaImporter PROPERTIES POSITION_INDEPENDENT_CODE ON) endif() diff --git a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt b/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt index 4edb7fd27..ff9fbca3d 100644 --- a/src/MagnumPlugins/WavAudioImporter/CMakeLists.txt +++ b/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()