Browse Source

Work around Xcode project limitations in more cases.

Not sure why this wasn't a problem with OSX build, only iOS.
pull/157/head
Vladimír Vondruš 10 years ago
parent
commit
8677465379
  1. 2
      src/Magnum/CMakeLists.txt
  2. 2
      src/Magnum/Platform/CMakeLists.txt
  3. 4
      src/MagnumPlugins/MagnumFont/CMakeLists.txt
  4. 4
      src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt
  5. 4
      src/MagnumPlugins/ObjImporter/CMakeLists.txt
  6. 4
      src/MagnumPlugins/TgaImageConverter/CMakeLists.txt
  7. 4
      src/MagnumPlugins/TgaImporter/CMakeLists.txt
  8. 4
      src/MagnumPlugins/WavAudioImporter/CMakeLists.txt
  9. 0
      src/dummy.cpp

2
src/Magnum/CMakeLists.txt

@ -323,7 +323,7 @@ if(BUILD_TESTS)
# Library with graceful assert for testing
add_library(MagnumMathTestLib ${SHARED_OR_STATIC}
$<TARGET_OBJECTS:MagnumMathObjects>
dummy.cpp) # XCode workaround, see file comment for details
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
target_include_directories(MagnumMathTestLib PUBLIC $<TARGET_PROPERTY:Magnum,INTERFACE_INCLUDE_DIRECTORIES>)
target_compile_definitions(MagnumMathTestLib PRIVATE "CORRADE_GRACEFUL_ASSERT")
set_target_properties(MagnumMathTestLib PROPERTIES DEBUG_POSTFIX "-d")

2
src/Magnum/Platform/CMakeLists.txt

@ -645,7 +645,7 @@ if(NEED_EGLCONTEXT OR WITH_EGLCONTEXT)
if(WITH_EGLCONTEXT)
add_library(MagnumEglContext STATIC
$<TARGET_OBJECTS:MagnumEglContextObjects>
../dummy.cpp) # XCode workaround, see file comment for details
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
set_target_properties(MagnumEglContext PROPERTIES DEBUG_POSTFIX "-d")
if(BUILD_STATIC_PIC)
set_target_properties(MagnumEglContext PROPERTIES POSITION_INDEPENDENT_CODE ON)

4
src/MagnumPlugins/MagnumFont/CMakeLists.txt

@ -65,7 +65,9 @@ if(BUILD_GL_TESTS)
${MagnumFont_HEADERS})
target_compile_definitions(MagnumMagnumFontTestLib PRIVATE "MAGNUM_TGAIMPORTER_BUILD_STATIC")
else()
add_library(MagnumMagnumFontTestLib STATIC $<TARGET_OBJECTS:MagnumFontObjects>)
add_library(MagnumMagnumFontTestLib STATIC
$<TARGET_OBJECTS:MagnumFontObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
endif()
target_link_libraries(MagnumMagnumFontTestLib Magnum MagnumText MagnumTgaImporterTestLib)

4
src/MagnumPlugins/MagnumFontConverter/CMakeLists.txt

@ -65,7 +65,9 @@ if(BUILD_GL_TESTS)
${MagnumFontConverter_HEADERS})
target_compile_definitions(MagnumMagnumFontConverterTestLib PRIVATE "MAGNUM_TGAIMAGECONVERTER_BUILD_STATIC")
else()
add_library(MagnumMagnumFontConverterTestLib STATIC $<TARGET_OBJECTS:MagnumFontConverterObjects>)
add_library(MagnumMagnumFontConverterTestLib STATIC
$<TARGET_OBJECTS:MagnumFontConverterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
endif()
target_link_libraries(MagnumMagnumFontConverterTestLib Magnum MagnumText MagnumTgaImageConverterTestLib)

4
src/MagnumPlugins/ObjImporter/CMakeLists.txt

@ -51,7 +51,9 @@ target_link_libraries(ObjImporter Magnum MagnumMeshTools)
install(FILES ${ObjImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/ObjImporter)
if(BUILD_TESTS)
add_library(MagnumObjImporterTestLib STATIC $<TARGET_OBJECTS:ObjImporterObjects>)
add_library(MagnumObjImporterTestLib STATIC
$<TARGET_OBJECTS:ObjImporterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
target_link_libraries(MagnumObjImporterTestLib Magnum MagnumMeshTools)
add_subdirectory(Test)
endif()

4
src/MagnumPlugins/TgaImageConverter/CMakeLists.txt

@ -62,7 +62,9 @@ install(FILES ${TgaImageConverter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImageConverter)
if(BUILD_TESTS)
add_library(MagnumTgaImageConverterTestLib STATIC $<TARGET_OBJECTS:TgaImageConverterObjects>)
add_library(MagnumTgaImageConverterTestLib STATIC
$<TARGET_OBJECTS:TgaImageConverterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
target_link_libraries(MagnumTgaImageConverterTestLib Magnum)
add_subdirectory(Test)

4
src/MagnumPlugins/TgaImporter/CMakeLists.txt

@ -63,7 +63,9 @@ install(FILES ${TgaImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTAL
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/configure.h DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/TgaImporter)
if(BUILD_TESTS)
add_library(MagnumTgaImporterTestLib STATIC $<TARGET_OBJECTS:TgaImporterObjects>)
add_library(MagnumTgaImporterTestLib STATIC
$<TARGET_OBJECTS:TgaImporterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
target_link_libraries(MagnumTgaImporterTestLib Magnum)
add_subdirectory(Test)

4
src/MagnumPlugins/WavAudioImporter/CMakeLists.txt

@ -54,7 +54,9 @@ target_link_libraries(WavAudioImporter Magnum MagnumAudio)
install(FILES ${WavAudioImporter_HEADERS} DESTINATION ${MAGNUM_PLUGINS_INCLUDE_INSTALL_DIR}/WavAudioImporter)
if(BUILD_TESTS)
add_library(MagnumWavAudioImporterTestLib STATIC $<TARGET_OBJECTS:WavAudioImporterObjects>)
add_library(MagnumWavAudioImporterTestLib STATIC
$<TARGET_OBJECTS:WavAudioImporterObjects>
${PROJECT_SOURCE_DIR}/src/dummy.cpp) # XCode workaround, see file comment for details
target_link_libraries(MagnumWavAudioImporterTestLib Magnum MagnumAudio)
add_subdirectory(Test)
endif()

0
src/Magnum/dummy.cpp → src/dummy.cpp

Loading…
Cancel
Save