Changeset 541:4b558ee0d4f5 in lemon

Timestamp:

04/28/09 14:42:28 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

1.0

Parents:

537:ca12939f8b00 (diff), 540:8a144437db7d (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 bugfixes #274 and #275

Files:

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

CMakeLists.txt

@@ -24 +24 @@
 INCLUDE(FindGhostscript)
 
+ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+
 INCLUDE(CheckTypeSize)
-CHECK_TYPE_SIZE("long long" LONG_LONG)
+CHECK_TYPE_SIZE("long long" LEMON_LONG_LONG)
 
 ENABLE_TESTING()

CMakeLists.txt

@@ -11 +11 @@
 
 SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+
+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)
 
 INCLUDE(FindDoxygen)