# HG changeset patch # User Alpar Juttner # Date 1611214613 -3600 # Node ID 736a341e604b983e4ae9f4f47120fad0bef131c7 # Parent 8c567e298d7f3fad82cc66754f2fb6c4a420366b Update CMakeLists.txt to match current CMAKE versions (#641) diff -r 8c567e298d7f -r 736a341e604b CMakeLists.txt --- a/CMakeLists.txt Sat Oct 27 13:00:48 2018 +0200 +++ b/CMakeLists.txt Thu Jan 21 08:36:53 2021 +0100 @@ -5,12 +5,12 @@ ENDIF(POLICY CMP0048) IF(POLICY CMP0043) - CMAKE_POLICY(SET CMP0043 OLD) + CMAKE_POLICY(SET CMP0043 NEW) ENDIF(POLICY CMP0043) IF(POLICY CMP0026) #This is for copying the dll's needed by glpk (in lp_test and mip_test) - CMAKE_POLICY(SET CMP0026 OLD) + CMAKE_POLICY(SET CMP0026 NEW) ENDIF(POLICY CMP0026) SET(PROJECT_NAME "LEMON") @@ -196,36 +196,36 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LEMON_CXX_WARNING_FLAGS}") IF(MSVC) - SET(CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}") + SET( CMAKE_CXX_FLAGS "/bigobj ${CMAKE_CXX_FLAGS}") SET( CMAKE_CXX_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING - "Flags used by the C++ compiler during maintainer builds." + "Flags used by the C++ compiler during maintainer builds." FORCE ) SET( CMAKE_C_FLAGS_MAINTAINER "/WX ${CMAKE_CXX_FLAGS_DEBUG}" CACHE STRING - "Flags used by the C compiler during maintainer builds." + "Flags used by the C compiler during maintainer builds." FORCE ) SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING - "Flags used for linking binaries during maintainer builds." + "Flags used for linking binaries during maintainer builds." FORCE ) SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING "Flags used by the shared libraries linker during maintainer builds." + FORCE ) ELSE() SET( CMAKE_CXX_FLAGS_MAINTAINER "-Werror -ggdb -O0" CACHE STRING - "Flags used by the C++ compiler during maintainer builds." + "Flags used by the C++ compiler during maintainer builds." FORCE ) SET( CMAKE_C_FLAGS_MAINTAINER "-Werror -O0" CACHE STRING - "Flags used by the C compiler during maintainer builds." + "Flags used by the C compiler during maintainer builds." FORCE ) SET( CMAKE_EXE_LINKER_FLAGS_MAINTAINER "${CMAKE_EXE_LINKER_FLAGS_DEBUG}" CACHE STRING - "Flags used for linking binaries during maintainer builds." + "Flags used for linking binaries during maintainer builds." FORCE ) SET( CMAKE_SHARED_LINKER_FLAGS_MAINTAINER "${CMAKE_SHARED_LINKER_FLAGS_DEBUG}" CACHE STRING - "Flags used by the shared libraries linker during maintainer builds." - ) + "Flags used by the shared libraries linker during maintainer builds." FORCE) ENDIF() MARK_AS_ADVANCED( @@ -251,8 +251,8 @@ FORCE ) SET_DIRECTORY_PROPERTIES(PROPERTIES - COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG" - COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG" + COMPILE_DEFINITIONS + $<$,$>:LEMON_ENABLE_DEBUG> ) INCLUDE(CheckTypeSize) diff -r 8c567e298d7f -r 736a341e604b test/CMakeLists.txt --- a/test/CMakeLists.txt Sat Oct 27 13:00:48 2018 +0200 +++ b/test/CMakeLists.txt Thu Jan 21 08:36:53 2021 +0100 @@ -84,12 +84,10 @@ ADD_DEPENDENCIES(check lp_test) IF(WIN32 AND LEMON_HAVE_GLPK) - GET_TARGET_PROPERTY(TARGET_LOC lp_test LOCATION) - GET_FILENAME_COMPONENT(TARGET_PATH ${TARGET_LOC} PATH) ADD_CUSTOM_COMMAND(TARGET lp_test POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll ${TARGET_PATH} - COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll ${TARGET_PATH} - COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll ${TARGET_PATH} + COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/glpk.dll $ + COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll $ + COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll $ ) ENDIF()