Browse Source

Use policy instead

pull/504/head
Andy Maloney 5 years ago
parent
commit
1991a366ad
  1. 6
      CMakeLists.txt
  2. 4
      src/Magnum/Shaders/CMakeLists.txt
  3. 4
      src/Magnum/TextureTools/CMakeLists.txt

6
CMakeLists.txt

@ -30,6 +30,12 @@ if(HUNTER_ENABLED)
include(${CMAKE_CURRENT_LIST_DIR}/package/hunter/HunterInit.cmake)
endif()
# If CMAKE_AUTOMOC is set, all uses of corrade_add_resource() would otherwise
# complain on 3.10 that AUTOMOC is not processing GENERATED files
if(POLICY CMP0071)
cmake_policy(SET CMP0071 NEW)
endif()
project(Magnum CXX)
if(HUNTER_ENABLED)

4
src/Magnum/Shaders/CMakeLists.txt

@ -69,10 +69,6 @@ if(BUILD_STATIC)
set_property(SOURCE ${MagnumShaders_RCS} APPEND PROPERTY COMPILE_DEFINITIONS
"CORRADE_AUTOMATIC_INITIALIZER=CORRADE_NOOP"
"CORRADE_AUTOMATIC_FINALIZER=CORRADE_NOOP")
# Avoid warning when using AUTOGEN for Qt
if(NOT (${CMAKE_VERSION} VERSION_LESS "3.8.0"))
set_property(SOURCE ${MagnumShaders_RCS} PROPERTY SKIP_AUTOGEN ON)
endif()
endif()
target_include_directories(MagnumShadersObjects PUBLIC
$<TARGET_PROPERTY:Magnum,INTERFACE_INCLUDE_DIRECTORIES>

4
src/Magnum/TextureTools/CMakeLists.txt

@ -41,10 +41,6 @@ if(TARGET_GL)
COMPILE_DEFINITIONS
"CORRADE_AUTOMATIC_INITIALIZER=CORRADE_NOOP"
"CORRADE_AUTOMATIC_FINALIZER=CORRADE_NOOP")
# Avoid warning when using AUTOGEN for Qt
if(NOT (${CMAKE_VERSION} VERSION_LESS "3.8.0"))
set_property(SOURCE ${MagnumTextureTools_RCS} PROPERTY SKIP_AUTOGEN ON)
endif()
endif()
list(APPEND MagnumTextureTools_SRCS

Loading…
Cancel
Save