Browse Source

CMake: MeshTools now depends on Trade unconditionally.

Isn't it great when I discover this five minutes before merging to
master?
pull/371/head
Vladimír Vondruš 6 years ago
parent
commit
236954ad16
  1. 5
      modules/FindMagnum.cmake
  2. 8
      src/Magnum/MeshTools/CMakeLists.txt

5
modules/FindMagnum.cmake

@ -378,10 +378,9 @@ if(MAGNUM_TARGET_GL)
set(_MAGNUM_DebugTools_GL_DEPENDENCY_IS_OPTIONAL ON)
endif()
set(_MAGNUM_MeshTools_DEPENDENCIES )
set(_MAGNUM_MeshTools_DEPENDENCIES Trade)
if(MAGNUM_TARGET_GL)
# Trade is used only in compile(), which needs GL as well
list(APPEND _MAGNUM_MeshTools_DEPENDENCIES Trade GL)
list(APPEND _MAGNUM_MeshTools_DEPENDENCIES GL)
endif()
set(_MAGNUM_OpenGLTester_DEPENDENCIES GL)

8
src/Magnum/MeshTools/CMakeLists.txt

@ -106,9 +106,9 @@ elseif(BUILD_STATIC_PIC)
set_target_properties(MagnumMeshTools PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
target_link_libraries(MagnumMeshTools PUBLIC
Magnum)
Magnum MagnumTrade)
if(TARGET_GL)
target_link_libraries(MagnumMeshTools PUBLIC MagnumGL MagnumTrade)
target_link_libraries(MagnumMeshTools PUBLIC MagnumGL)
endif()
install(TARGETS MagnumMeshTools
@ -131,9 +131,9 @@ if(BUILD_TESTS)
set_target_properties(MagnumMeshToolsTestLib PROPERTIES POSITION_INDEPENDENT_CODE ON)
endif()
target_link_libraries(MagnumMeshToolsTestLib PUBLIC
Magnum)
Magnum MagnumTrade)
if(TARGET_GL)
target_link_libraries(MagnumMeshToolsTestLib PUBLIC MagnumGL MagnumTrade)
target_link_libraries(MagnumMeshToolsTestLib PUBLIC MagnumGL)
endif()
add_subdirectory(Test)

Loading…
Cancel
Save