Changeset 564:2b6d5d22bb23 in lemon for CMakeLists.txt

Timestamp:

02/20/09 22:37:19 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

563:dab9e610e37d (diff), 518:b1ef32ab39f3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge

Files:

• CMakeLists.txt (modified) (1 diff)
• CMakeLists.txt (modified) (1 diff)

CMakeLists.txt

@@ -14 +14 @@
 INCLUDE(FindDoxygen)
 INCLUDE(FindGhostscript)
+FIND_PACKAGE(GLPK 4.33)
+
+ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+
+IF(MSVC)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4250 /wd4355 /wd4800 /wd4996")
+# Suppressed warnings:
+# C4250: 'class1' : inherits 'class2::member' via dominance
+# C4355: 'this' : used in base member initializer list
+# C4800: 'type' : forcing value to bool 'true' or 'false' (performance warning)
+# C4996: 'function': was declared deprecated
+ENDIF(MSVC)
+
+IF(GLPK_FOUND)
+  SET(HAVE_LP TRUE)
+  SET(HAVE_MIP TRUE)
+  SET(HAVE_GLPK TRUE)
+ENDIF(GLPK_FOUND)
 
 INCLUDE(CheckTypeSize)

CMakeLists.txt

@@ -32 +32 @@
   SET(HAVE_GLPK TRUE)
 ENDIF(GLPK_FOUND)
+
+INCLUDE(CheckTypeSize)
+CHECK_TYPE_SIZE("long long" LONG_LONG)
 
 ENABLE_TESTING()