Changeset 981:cdd2c7dad989 in lemon-main

Timestamp:

01/30/12 10:54:49 (13 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Remove autotool related files (#434)

Files:

• Makefile.am (deleted)
• configure.ac (deleted)
• demo/Makefile.am (deleted)
• doc/Makefile.am (deleted)
• lemon/CMakeLists.txt (modified) (1 diff)
• lemon/Makefile.am (deleted)
• lemon/config.h.cmake (deleted)
• lemon/config.h.in (modified) (1 diff)
• lemon/lemon.pc.cmake (deleted)
• lemon/lemon.pc.in (modified) (1 diff)
• m4/lx_check_coin.m4 (deleted)
• m4/lx_check_cplex.m4 (deleted)
• m4/lx_check_glpk.m4 (deleted)
• m4/lx_check_soplex.m4 (deleted)
• scripts/Makefile.am (deleted)
• scripts/bootstrap.sh (deleted)
• scripts/mk-release.sh (deleted)
• test/Makefile.am (deleted)
• tools/Makefile.am (deleted)

lemon/CMakeLists.txt

@@ -5 +5 @@
 
 CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake
+  ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
   ${CMAKE_CURRENT_BINARY_DIR}/config.h
 )
 
 CONFIGURE_FILE(
-  ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.cmake
+  ${CMAKE_CURRENT_SOURCE_DIR}/lemon.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc
   @ONLY

lemon/config.h.in

@@ -1 @@
-/* The version string */
-#undef LEMON_VERSION
-
-/* Define to 1 if you have long long */
-#undef LEMON_HAVE_LONG_LONG
-
-/* Define to 1 if you have any LP solver. */
-#undef LEMON_HAVE_LP
-
-/* Define to 1 if you have any MIP solver. */
-#undef LEMON_HAVE_MIP
-
-/* Define to 1 if you have CPLEX. */
-#undef LEMON_HAVE_CPLEX
-
-/* Define to 1 if you have GLPK. */
-#undef LEMON_HAVE_GLPK
-
-/* Define to 1 if you have SOPLEX */
-#undef LEMON_HAVE_SOPLEX
-
-/* Define to 1 if you have CLP */
-#undef LEMON_HAVE_CLP
-
-/* Define to 1 if you have CBC */
-#undef LEMON_HAVE_CBC
-
-/* Define to 1 if you have pthread */
-#undef LEMON_USE_PTHREAD
-
-/* Define to 1 if you have win32 threads */
-#undef LEMON_USE_WIN32_THREADS
+#define LEMON_VERSION "@PROJECT_VERSION@"
+#cmakedefine LEMON_HAVE_LONG_LONG 1
+#cmakedefine LEMON_HAVE_LP 1
+#cmakedefine LEMON_HAVE_MIP 1
+#cmakedefine LEMON_HAVE_GLPK 1
+#cmakedefine LEMON_HAVE_CPLEX 1
+#cmakedefine LEMON_HAVE_CLP 1
+#cmakedefine LEMON_HAVE_CBC 1
+#cmakedefine LEMON_USE_PTHREAD 1
+#cmakedefine LEMON_USE_WIN32_THREADS 1

lemon/lemon.pc.in

@@ -1 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@/bin
+libdir=@CMAKE_INSTALL_PREFIX@/lib
+includedir=@CMAKE_INSTALL_PREFIX@/include
 
-Name: @PACKAGE_NAME@
+Name: @PROJECT_NAME@
 Description: Library for Efficient Modeling and Optimization in Networks
-Version: @PACKAGE_VERSION@
+Version: @PROJECT_VERSION@
 Libs: -L${libdir} -lemon @GLPK_LIBS@ @CPLEX_LIBS@ @SOPLEX_LIBS@ @CLP_LIBS@ @CBC_LIBS@
 Cflags: -I${includedir}