Changeset 1204:736a341e604b in lemon-main

Timestamp:

01/21/21 08:36:53 (4 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Amend:

32376437633537633262363963663731366366613239663765626537633639316330363436623563

Message:

Update CMakeLists.txt to match current CMAKE versions (#641)

Files:

• CMakeLists.txt (modified) (3 diffs)
• test/CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -6 +6 @@
 
 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)
 
@@ -197 +197 @@
 
 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()
 
@@ -252 +252 @@
 
 SET_DIRECTORY_PROPERTIES(PROPERTIES
-  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
-  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
+  COMPILE_DEFINITIONS
+  $<$<OR:$<CONFIG:Debug>,$<CONFIG:Maintainer>>:LEMON_ENABLE_DEBUG>
 )
 

test/CMakeLists.txt

@@ -85 +85 @@
 
   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 $<TARGET_FILE_DIR:lp_test>
+      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/libltdl3.dll $<TARGET_FILE_DIR:lp_test>
+      COMMAND ${CMAKE_COMMAND} -E copy ${GLPK_BIN_DIR}/zlib1.dll $<TARGET_FILE_DIR:lp_test>
     )
   ENDIF()