diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 08ab7729b..f4f6928ae 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -31,6 +31,11 @@ IF(COMMAND cmake_policy) # Works around warnings about escaped quotes in ADD_DEFINITIONS # statements 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) INCLUDE(nel) diff --git a/code/nel/tools/3d/panoply_preview/CMakeLists.txt b/code/nel/tools/3d/panoply_preview/CMakeLists.txt index 6d1cbd354..4f96eeea3 100644 --- a/code/nel/tools/3d/panoply_preview/CMakeLists.txt +++ b/code/nel/tools/3d/panoply_preview/CMakeLists.txt @@ -15,7 +15,6 @@ SET(CMAKE_AUTOMOC ON) QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES}) -CMAKE_POLICY(SET CMP0020 NEW) ADD_EXECUTABLE(nl_panoply_preview WIN32 ${SRC} ${SRCS} ${HDRS} diff --git a/code/nel/tools/3d/shared_widgets/CMakeLists.txt b/code/nel/tools/3d/shared_widgets/CMakeLists.txt index 153995dd2..4208988ec 100644 --- a/code/nel/tools/3d/shared_widgets/CMakeLists.txt +++ b/code/nel/tools/3d/shared_widgets/CMakeLists.txt @@ -11,7 +11,6 @@ SET(CMAKE_AUTOMOC ON) QT5_ADD_RESOURCES(RESOURCE_ADDED ${RESOURCES}) -CMAKE_POLICY(SET CMP0020 NEW) NL_TARGET_LIB(shared_widgets ${SRCS} ${HDRS} ${RSRC} ${RESOURCE_ADDED}) TARGET_LINK_LIBRARIES(shared_widgets nelmisc nel3d Qt5::Widgets)