Browse Source

Link all magnum-* utilities to Corrade::Main.

So it's possible to use paths containing Unicode characters with them on
Windows.
pull/499/head
Vladimír Vondruš 3 years ago
parent
commit
eafb2de1f1
  1. 6
      src/Magnum/Audio/CMakeLists.txt
  2. 6
      src/Magnum/Platform/CMakeLists.txt
  3. 3
      src/Magnum/SceneTools/CMakeLists.txt
  4. 3
      src/Magnum/ShaderTools/CMakeLists.txt
  5. 3
      src/Magnum/Text/CMakeLists.txt
  6. 3
      src/Magnum/TextureTools/CMakeLists.txt
  7. 3
      src/Magnum/Trade/CMakeLists.txt
  8. 6
      src/Magnum/Vk/CMakeLists.txt

6
src/Magnum/Audio/CMakeLists.txt

@ -130,8 +130,12 @@ endif()
add_library(Magnum::Audio ALIAS MagnumAudio)
if(MAGNUM_WITH_AL_INFO)
find_package(Corrade REQUIRED Main)
add_executable(magnum-al-info al-info.cpp)
target_link_libraries(magnum-al-info PRIVATE MagnumAudio)
target_link_libraries(magnum-al-info PRIVATE
Corrade::Main
MagnumAudio)
if(NOT MAGNUM_TARGET_EMSCRIPTEN)
install(TARGETS magnum-al-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})

6
src/Magnum/Platform/CMakeLists.txt

@ -913,8 +913,12 @@ if(MAGNUM_WITH_GL_INFO)
message(SEND_ERROR "magnum-gl-info is available only if MAGNUM_TARGET_GL is enabled")
endif()
find_package(Corrade REQUIRED Main)
add_executable(magnum-gl-info gl-info.cpp)
target_link_libraries(magnum-gl-info PRIVATE MagnumGL)
target_link_libraries(magnum-gl-info PRIVATE
Corrade::Main
MagnumGL)
if(MAGNUM_TARGET_EGL)
target_link_libraries(magnum-gl-info PRIVATE MagnumWindowlessEglApplication)
elseif(CORRADE_TARGET_IOS)

3
src/Magnum/SceneTools/CMakeLists.txt

@ -93,8 +93,11 @@ install(TARGETS MagnumSceneTools
install(FILES ${MagnumSceneTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/SceneTools)
if(MAGNUM_WITH_SCENECONVERTER)
find_package(Corrade REQUIRED Main)
add_executable(magnum-sceneconverter sceneconverter.cpp)
target_link_libraries(magnum-sceneconverter PRIVATE
Corrade::Main
Magnum
MagnumMeshTools
MagnumSceneTools

3
src/Magnum/ShaderTools/CMakeLists.txt

@ -88,8 +88,11 @@ install(TARGETS MagnumShaderTools
install(FILES ${MagnumShaderTools_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/ShaderTools)
if(MAGNUM_WITH_SHADERCONVERTER)
find_package(Corrade REQUIRED Main)
add_executable(magnum-shaderconverter shaderconverter.cpp)
target_link_libraries(magnum-shaderconverter PRIVATE
Corrade::Main
Magnum
MagnumShaderTools
${MAGNUM_SHADERCONVERTER_STATIC_PLUGINS})

3
src/Magnum/Text/CMakeLists.txt

@ -112,8 +112,11 @@ if(MAGNUM_WITH_FONTCONVERTER)
message(SEND_ERROR "magnum-fontconverter is available only if MAGNUM_TARGET_GL is enabled")
endif()
find_package(Corrade REQUIRED Main)
add_executable(magnum-fontconverter fontconverter.cpp)
target_link_libraries(magnum-fontconverter PRIVATE
Corrade::Main
Magnum
MagnumText
MagnumTrade

3
src/Magnum/TextureTools/CMakeLists.txt

@ -92,8 +92,11 @@ if(MAGNUM_WITH_DISTANCEFIELDCONVERTER)
message(SEND_ERROR "magnum-distancefieldconverter is available only if MAGNUM_TARGET_GL is enabled")
endif()
find_package(Corrade REQUIRED Main)
add_executable(magnum-distancefieldconverter distancefieldconverter.cpp)
target_link_libraries(magnum-distancefieldconverter PRIVATE
Corrade::Main
Magnum
MagnumTextureTools
MagnumTrade

3
src/Magnum/Trade/CMakeLists.txt

@ -151,11 +151,14 @@ install(TARGETS MagnumTrade
install(FILES ${MagnumTrade_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Trade)
if(MAGNUM_WITH_IMAGECONVERTER)
find_package(Corrade REQUIRED Main)
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
find_package(Threads REQUIRED)
add_executable(magnum-imageconverter imageconverter.cpp)
target_link_libraries(magnum-imageconverter PRIVATE
Corrade::Main
Magnum
MagnumTrade
# BasisImageConverter uses these, and linking pthread to just the

6
src/Magnum/Vk/CMakeLists.txt

@ -190,8 +190,12 @@ install(TARGETS MagnumVk
install(FILES ${MagnumVk_HEADERS} DESTINATION ${MAGNUM_INCLUDE_INSTALL_DIR}/Vk)
if(MAGNUM_WITH_VK_INFO)
find_package(Corrade REQUIRED Main)
add_executable(magnum-vk-info vk-info.cpp)
target_link_libraries(magnum-vk-info PRIVATE MagnumVk)
target_link_libraries(magnum-vk-info PRIVATE
Corrade::Main
MagnumVk)
install(TARGETS magnum-vk-info DESTINATION ${MAGNUM_BINARY_INSTALL_DIR})

Loading…
Cancel
Save