Changes in / [392:ca12939f8b00:396:4b558ee0d4f5] in lemon-1.0

Files:

• CMakeLists.txt (modified) (1 diff)
• configure.ac (modified) (1 diff)
• demo/CMakeLists.txt (modified) (1 diff)
• lemon/CMakeLists.txt (modified) (2 diffs)
• lemon/Makefile.am (modified) (1 diff)
• lemon/bits/default_map.h (modified) (1 diff)
• lemon/config.h.cmake (modified) (1 diff)
• lemon/config.h.in (modified) (1 diff)
• m4/lx_check_cplex.m4 (modified) (1 diff)
• m4/lx_check_glpk.m4 (modified) (1 diff)
• m4/lx_check_soplex.m4 (modified) (1 diff)
• test/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()

configure.ac

@@ -28 +28 @@
 AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
 if test x"$long_long_found" = x"yes"; then
-  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
+  AC_DEFINE([LEMON_HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
 fi
 

demo/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}
+  ${PROJECT_BINARY_DIR}
+)
 
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)

lemon/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}
+  ${PROJECT_BINARY_DIR}
+)
+
+CONFIGURE_FILE(
+  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
 
 ADD_LIBRARY(lemon
@@ -19 +27 @@
   COMPONENT headers
   FILES_MATCHING PATTERN "*.h")
+
+INSTALL(
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h
+  DESTINATION include/lemon
+  COMPONENT headers)

lemon/Makefile.am

@@ -24 +24 @@
         lemon/color.h \
         lemon/concept_check.h \
+        lemon/config.h \
         lemon/counter.h \
         lemon/core.h \

lemon/bits/default_map.h

@@ -98 +98 @@
 
 
-#if defined HAVE_LONG_LONG
+#if defined LEMON_HAVE_LONG_LONG
 
   // long long

lemon/config.h.cmake

@@ -1 @@
-#cmakedefine HAVE_LONG_LONG 1
+#cmakedefine LEMON_HAVE_LONG_LONG 1

lemon/config.h.in

@@ -1 +1 @@
 /* Define to 1 if you have CPLEX. */
-#undef HAVE_CPLEX
+#undef LEMON_HAVE_CPLEX
 
 /* Define to 1 if you have GLPK. */
-#undef HAVE_GLPK
+#undef LEMON_HAVE_GLPK
 
 /* Define to 1 if you have long long */
-#undef HAVE_LONG_LONG
+#undef LEMON_HAVE_LONG_LONG

m4/lx_check_cplex.m4

@@ -62 +62 @@
 
     if test x"$lx_cplex_found" = x"yes"; then
-      AC_DEFINE([HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
+      AC_DEFINE([LEMON_HAVE_CPLEX], [1], [Define to 1 if you have CPLEX.])
       AC_MSG_RESULT([yes])
     else

m4/lx_check_glpk.m4

@@ -60 +60 @@
 
     if test x"$lx_glpk_found" = x"yes"; then
-      AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
+      AC_DEFINE([LEMON_HAVE_GLPK], [1], [Define to 1 if you have GLPK.])
       AC_MSG_RESULT([yes])
     else

m4/lx_check_soplex.m4

@@ -56 +56 @@
 
     if test x"$lx_soplex_found" = x"yes"; then
-      AC_DEFINE([HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
+      AC_DEFINE([LEMON_HAVE_SOPLEX], [1], [Define to 1 if you have SOPLEX.])
       AC_MSG_RESULT([yes])
     else

test/CMakeLists.txt

@@ -1 @@
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}
+  ${PROJECT_BINARY_DIR}
+)
 
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/lemon)