Changed: Set CMP0020 NEW in root project

This commit is contained in:
kervala 2016-01-16 23:48:32 +01:00
parent 8124033e69
commit 1cc7c18f1a
3 changed files with 5 additions and 2 deletions

View file

@ -31,6 +31,11 @@ IF(COMMAND cmake_policy)
# Works around warnings about escaped quotes in ADD_DEFINITIONS # Works around warnings about escaped quotes in ADD_DEFINITIONS
# statements # statements
cmake_policy(SET CMP0005 OLD) cmake_policy(SET CMP0005 OLD)
# allow to link to qtmain automatically under Windows
IF(POLICY CMP0020)
CMAKE_POLICY(SET CMP0020 NEW)
ENDIF()
ENDIF(COMMAND cmake_policy) ENDIF(COMMAND cmake_policy)
INCLUDE(nel) INCLUDE(nel)

View file

@ -15,7 +15,6 @@ SET(CMAKE_AUTOMOC ON)
QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES}) QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES})
CMAKE_POLICY(SET CMP0020 NEW)
ADD_EXECUTABLE(nl_panoply_preview WIN32 ${SRC} ADD_EXECUTABLE(nl_panoply_preview WIN32 ${SRC}
${SRCS} ${SRCS}
${HDRS} ${HDRS}

View file

@ -11,7 +11,6 @@ SET(CMAKE_AUTOMOC ON)
QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES}) QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES})
CMAKE_POLICY(SET CMP0020 NEW)
NL_TARGET_LIB(shared_widgets ${SRCS} ${HDRS} ${RSRC} ${RESOURCE_ADDED}) NL_TARGET_LIB(shared_widgets ${SRCS} ${HDRS} ${RSRC} ${RESOURCE_ADDED})
TARGET_LINK_LIBRARIES(shared_widgets nelmisc nel3d Qt5::Widgets) TARGET_LINK_LIBRARIES(shared_widgets nelmisc nel3d Qt5::Widgets)