Browse Source

CMake: specify folders for plugins as well.

pull/216/head
Vladimír Vondruš 9 years ago
parent
commit
dca4ba7881
  1. 2
      src/MagnumPlugins/CMakeLists.txt
  2. 3
      src/MagnumPlugins/MagnumFont/CMakeLists.txt
  3. 1
      src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt
  4. 3
      src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
  5. 1
      src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt
  6. 2
      src/MagnumPlugins/ObjImporter/CMakeLists.txt
  7. 1
      src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt
  8. 2
      src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
  9. 1
      src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt
  10. 2
      src/MagnumPlugins/TgaImporter/CMakeLists.txt
  11. 1
      src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt
  12. 2
      src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
  13. 1
      src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt

2
src/MagnumPlugins/CMakeLists.txt

@ -27,8 +27,10 @@
macro(add_plugin plugin_name debug_install_dirs release_install_dirs metadata_file)
if(NOT BUILD_PLUGINS_STATIC)
corrade_add_plugin(${plugin_name} "${debug_install_dirs}" "${release_install_dirs}" ${metadata_file} ${ARGN})
set_target_properties(${plugin_name} ${plugin_name}-metadata PROPERTIES FOLDER "MagnumPlugins/${plugin_name}")
else()
corrade_add_static_plugin(${plugin_name} "${release_install_dirs}" ${metadata_file} ${ARGN})
set_target_properties(${plugin_name} ${plugin_name}-dependencies PROPERTIES FOLDER "MagnumPlugins/${plugin_name}")
endif()
endmacro()

3
src/MagnumPlugins/MagnumFont/CMakeLists.txt

@ -47,6 +47,7 @@ endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(MagnumFontObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
set_target_properties(MagnumFontObjects PROPERTIES FOLDER "MagnumPlugins/MagnumFont")
# MagnumFont plugin
add_plugin(MagnumFont
@ -58,7 +59,6 @@ add_plugin(MagnumFont
if(BUILD_STATIC_PIC)
set_target_properties(MagnumFont PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
target_link_libraries(MagnumFont Magnum MagnumText)
if(CORRADE_TARGET_WINDOWS)
target_link_libraries(MagnumFont TgaImporter)
@ -84,6 +84,7 @@ if(BUILD_GL_TESTS)
$<TARGET_OBJECTS:MagnumFontObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
endif()
set_target_properties(MagnumMagnumFontTestLib PROPERTIES FOLDER "MagnumPlugins/MagnumFont")
target_link_libraries(MagnumMagnumFontTestLib Magnum MagnumText MagnumTgaImporterTestLib)
add_subdirectory(Test)

1
src/MagnumPlugins/MagnumFont/Test/CMakeLists.txt

@ -27,4 +27,5 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/configure.h)
corrade_add_test(MagnumFontGLTest MagnumFontGLTest.cpp LIBRARIES MagnumMagnumFontTestLib MagnumOpenGLTester)
set_target_properties(MagnumFontGLTest PROPERTIES FOLDER "MagnumPlugins/MagnumFont/Test")
target_include_directories(MagnumFontGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

3
src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt

@ -47,6 +47,7 @@ endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(MagnumFontConverterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
set_target_properties(MagnumFontConverterObjects PROPERTIES FOLDER "MagnumPlugins/MagnumFontConverter")
# MagnumFontConverter plugin
add_plugin(MagnumFontConverter
@ -58,7 +59,6 @@ add_plugin(MagnumFontConverter
if(BUILD_STATIC_PIC)
set_target_properties(MagnumFontConverter PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
target_link_libraries(MagnumFontConverter Magnum MagnumText)
if(CORRADE_TARGET_WINDOWS)
target_link_libraries(MagnumFontConverter TgaImageConverter)
@ -84,6 +84,7 @@ if(BUILD_GL_TESTS)
$<TARGET_OBJECTS:MagnumFontConverterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
endif()
set_target_properties(MagnumMagnumFontConverterTestLib PROPERTIES FOLDER "MagnumPlugins/MagnumFontConverter")
target_link_libraries(MagnumMagnumFontConverterTestLib Magnum MagnumText MagnumTgaImageConverterTestLib)
add_subdirectory(Test)

1
src/MagnumPlugins/MagnumFontConverter/Test/CMakeLists.txt

@ -30,6 +30,7 @@ corrade_add_test(MagnumFontConverterGLTest MagnumFontConverterGLTest.cpp LIBRARI
MagnumMagnumFontConverterTestLib
MagnumTgaImporterTestLib
MagnumOpenGLTester)
set_target_properties(MagnumFontConverterGLTest PROPERTIES FOLDER "MagnumPlugins/MagnumFontConverter/Test")
target_include_directories(MagnumFontConverterGLTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
# On Win32 we need to avoid dllimporting TgaImporter symbols, because it would
# search for the symbols in some DLL even though they were linked statically.

2
src/MagnumPlugins/ObjImporter/CMakeLists.txt

@ -47,6 +47,7 @@ endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(ObjImporterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
set_target_properties(ObjImporterObjects PROPERTIES FOLDER "MagnumPlugins/ObjImporter")
# ObjImporter plugin
add_plugin(ObjImporter
@ -67,6 +68,7 @@ if(BUILD_TESTS)
add_library(MagnumObjImporterTestLib STATIC
$<TARGET_OBJECTS:ObjImporterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
set_target_properties(MagnumObjImporterTestLib PROPERTIES FOLDER "MagnumPlugins/ObjImporter")
target_link_libraries(MagnumObjImporterTestLib Magnum MagnumMeshTools)
add_subdirectory(Test)

1
src/MagnumPlugins/ObjImporter/Test/CMakeLists.txt

@ -53,6 +53,7 @@ corrade_add_test(ObjImporterTest Test.cpp
wrongNumberCount.obj
wrongNumbers.obj)
target_include_directories(ObjImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(ObjImporterTest PROPERTIES FOLDER "MagnumPlugins/ObjImporter/Test")
# On Win32 we need to avoid dllimporting ObjImporter symbols, because it would
# search for the symbols in some DLL even though they were linked statically.
# However it apparently doesn't matter that they were dllexported when building

2
src/MagnumPlugins/TgaImageConverter/CMakeLists.txt

@ -47,6 +47,7 @@ endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(TgaImageConverterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
set_target_properties(TgaImageConverterObjects PROPERTIES FOLDER "MagnumPlugins/TgaImageConverter")
# TgaImageConverter plugin
add_plugin(TgaImageConverter
@ -67,6 +68,7 @@ if(BUILD_TESTS)
add_library(MagnumTgaImageConverterTestLib STATIC
$<TARGET_OBJECTS:TgaImageConverterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
set_target_properties(MagnumTgaImageConverterTestLib PROPERTIES FOLDER "MagnumPlugins/TgaImageConverter")
target_link_libraries(MagnumTgaImageConverterTestLib Magnum)
add_subdirectory(Test)

1
src/MagnumPlugins/TgaImageConverter/Test/CMakeLists.txt

@ -24,6 +24,7 @@
#
corrade_add_test(TgaImageConverterTest TgaImageConverterTest.cpp LIBRARIES MagnumTgaImageConverterTestLib MagnumTgaImporterTestLib)
set_target_properties(TgaImageConverterTest PROPERTIES FOLDER "MagnumPlugins/TgaImageConverter/Test")
# On Win32 we need to avoid dllimporting TgaImporter and TgaImageConverterTest
# symbols, because it would search for the symbols in some DLL even though they
# were linked statically. However it apparently doesn't matter that they were

2
src/MagnumPlugins/TgaImporter/CMakeLists.txt

@ -48,6 +48,7 @@ endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(TgaImporterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
set_target_properties(TgaImporterObjects PROPERTIES FOLDER "MagnumPlugins/TgaImporter")
# TgaImporter plugin
add_plugin(TgaImporter
@ -68,6 +69,7 @@ if(BUILD_TESTS)
add_library(MagnumTgaImporterTestLib STATIC
$<TARGET_OBJECTS:TgaImporterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
set_target_properties(MagnumTgaImporterTestLib PROPERTIES FOLDER "MagnumPlugins/TgaImporter")
target_link_libraries(MagnumTgaImporterTestLib Magnum)
add_subdirectory(Test)

1
src/MagnumPlugins/TgaImporter/Test/CMakeLists.txt

@ -36,6 +36,7 @@ corrade_add_test(TgaImporterTest TgaImporterTest.cpp
LIBRARIES MagnumTgaImporterTestLib
FILES file.tga)
target_include_directories(TgaImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(TgaImporterTest PROPERTIES FOLDER "MagnumPlugins/TgaImporter/Test")
# On Win32 we need to avoid dllimporting TgaImporter symbols, because it would
# search for the symbols in some DLL even though they were linked statically.
# However it apparently doesn't matter that they were dllexported when building

2
src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

@ -51,6 +51,7 @@ endif()
if(NOT BUILD_PLUGINS_STATIC OR BUILD_STATIC_PIC)
set_target_properties(WavAudioImporterObjects PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
set_target_properties(WavAudioImporterObjects PROPERTIES FOLDER "MagnumPlugins/WavAudioImporter")
# WavAudioImporter plugin
add_plugin(WavAudioImporter
@ -71,6 +72,7 @@ if(BUILD_TESTS)
add_library(MagnumWavAudioImporterTestLib STATIC
$<TARGET_OBJECTS:WavAudioImporterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
set_target_properties(MagnumWavAudioImporterTestLib PROPERTIES FOLDER "MagnumPlugins/WavAudioImporter")
target_link_libraries(MagnumWavAudioImporterTestLib Magnum MagnumAudio)
add_subdirectory(Test)

1
src/MagnumPlugins/WavAudioImporter/Test/CMakeLists.txt

@ -68,6 +68,7 @@ corrade_add_test(WavAudioImporterTest WavImporterTest.cpp
surround51Channel16.wav
surround71Channel24.wav)
target_include_directories(WavAudioImporterTest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
set_target_properties(WavAudioImporterTest PROPERTIES FOLDER "MagnumPlugins/WavAudioImporter/Test")
# On Win32 we need to avoid dllimporting WavAudioImporter symbols, because it
# would search for the symbols in some DLL even though they were linked
# statically. However it apparently doesn't matter that they were dllexported

Loading…
Cancel
Save