From ccee0aa3fd7dfc77ef7ac246f8905cbf72ae8eba Mon Sep 17 00:00:00 2001 From: ctrlaltca Date: Fri, 22 Sep 2017 17:47:05 +0200 Subject: [PATCH] Cmake: remove old unneeded POLICIES (fix Appveyor) (#2859) --- CMakeLists.txt | 23 +++-------------------- cockatrice/CMakeLists.txt | 6 +----- oracle/CMakeLists.txt | 3 --- servatrice/CMakeLists.txt | 6 +----- 4 files changed, 5 insertions(+), 33 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index acd24199..eade964c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,28 +8,10 @@ # Cmake 3.1 is required to enable C++11 support correctly cmake_minimum_required(VERSION 3.1) -if(POLICY CMP0020) - cmake_policy(SET CMP0020 OLD) -endif() - -if(POLICY CMP0043) - cmake_policy(SET CMP0043 OLD) -endif() - -if(POLICY CMP0048) - cmake_policy(SET CMP0048 OLD) -endif() - if(POLICY CMP0064) - cmake_policy(SET CMP0064 OLD) + cmake_policy(SET CMP0064 NEW) endif() -set(PROJECT_NAME "Cockatrice") -# Can be overriden by git tags, see cmake/getversion.cmake -set(PROJECT_VERSION_MAJOR "2") -set(PROJECT_VERSION_MINOR "3") -set(PROJECT_VERSION_PATCH "18") - # Default to "Release" build type # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call IF(DEFINED CMAKE_BUILD_TYPE) @@ -39,7 +21,8 @@ ELSE() ENDIF() # A project name is needed for CPack -PROJECT("${PROJECT_NAME}") +# Version can be overriden by git tags, see cmake/getversion.cmake +PROJECT("Cockatrice" VERSION 2.3.18) # Use c++11 for all targets set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ ISO Standard") diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 8834d92b..ac7ef897 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -221,11 +221,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # Build cockatrice binary and link it ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_MOC_SRCS}) -if(MSVC) - TARGET_LINK_LIBRARIES(cockatrice cockatrice_common Qt5::WinMain) -else() - TARGET_LINK_LIBRARIES(cockatrice cockatrice_common) -endif() +TARGET_LINK_LIBRARIES(cockatrice cockatrice_common) qt5_use_modules(cockatrice ${COCKATRICE_LIBS}) if(UNIX) diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index 3f0eec16..92cf1e97 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -111,9 +111,6 @@ ENDIF() # Build oracle binary and link it ADD_EXECUTABLE(oracle WIN32 MACOSX_BUNDLE ${oracle_SOURCES} ${oracle_QM} ${oracle_RESOURCES_RCC} ${oracle_MOC_SRCS}) -if(MSVC) - TARGET_LINK_LIBRARIES(oracle Qt5::WinMain) -endif() qt5_use_modules(oracle ${ORACLE_LIBS}) IF(ZLIB_FOUND) diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 2e2b562f..95a827be 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -109,11 +109,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) # Build servatrice binary and link it ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_RESOURCES_RCC} ${servatrice_MOC_SRCS}) -if(MSVC) - TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${CMAKE_THREAD_LIBS_INIT} Qt5::WinMain) -else() - TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${CMAKE_THREAD_LIBS_INIT}) -endif() +TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${CMAKE_THREAD_LIBS_INIT}) qt5_use_modules(servatrice ${SERVATRICE_LIBS}) # install rules