r18849 - gnucash/trunk - Cutecash: Fix CMakeLists for change in guile lookup, r18846

Christian Stimming cstim at code.gnucash.org
Sat Mar 6 06:00:55 EST 2010


Author: cstim
Date: 2010-03-06 06:00:54 -0500 (Sat, 06 Mar 2010)
New Revision: 18849
Trac: http://svn.gnucash.org/trac/changeset/18849

Modified:
   gnucash/trunk/CMakeLists.txt
   gnucash/trunk/src/CMakeLists.txt
   gnucash/trunk/src/backend/xml/CMakeLists.txt
   gnucash/trunk/src/business/business-core/CMakeLists.txt
   gnucash/trunk/src/core-utils/CMakeLists.txt
   gnucash/trunk/src/engine/CMakeLists.txt
   gnucash/trunk/src/gnc-module/CMakeLists.txt
   gnucash/trunk/src/gnc/CMakeLists.txt
Log:
Cutecash: Fix CMakeLists for change in guile lookup, r18846

Modified: gnucash/trunk/CMakeLists.txt
===================================================================
--- gnucash/trunk/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -53,16 +53,25 @@
 FIND_PACKAGE (SWIG REQUIRED)
 INCLUDE (${SWIG_USE_FILE})
 
-# guile
+# guile library and include dir
 FIND_PACKAGE (Guile REQUIRED)
+# We also need to look up the executable
+FIND_PROGRAM (GUILE_EXECUTABLE guile)
 
 # Check for guile version > 1.7, i.e. guile-1.8.x?
-IF (Guile_FIND_VERSION_MAJOR AND ${GUILE_VERSION_MAJOR} EQUAL 1
-    AND Guile_FIND_VERSION_MINOR AND ${GUILE_VERSION_MINOR} GREATER 7)
-  # Yes, define this macro
-  ADD_DEFINITIONS (-DHAVE_GUILE18)
-ENDIF (Guile_FIND_VERSION_MAJOR AND ${GUILE_VERSION_MAJOR} EQUAL 1
-    AND Guile_FIND_VERSION_MINOR AND ${GUILE_VERSION_MINOR} GREATER 7)
+IF (GUILE_INCLUDE_DIR)
+  IF (Guile_FIND_VERSION_MAJOR AND ${GUILE_VERSION_MAJOR} EQUAL 1
+      AND Guile_FIND_VERSION_MINOR AND ${GUILE_VERSION_MINOR} GREATER 7)
+    # Yes, define this macro
+    ADD_DEFINITIONS (-DHAVE_GUILE18)
+  ENDIF (Guile_FIND_VERSION_MAJOR AND ${GUILE_VERSION_MAJOR} EQUAL 1
+         AND Guile_FIND_VERSION_MINOR AND ${GUILE_VERSION_MINOR} GREATER 7)
+ELSE (GUILE_INCLUDE_DIR)
+  MESSAGE (SEND_ERROR "Guile was not found, but is required. Please set GUILE_LIBRARY and GUILE_INCLUDE_DIR.")
+ENDIF (GUILE_INCLUDE_DIR)
+IF (NOT GUILE_EXECUTABLE)
+  MESSAGe (SEND_ERROR "The guile executable was not found, but is required. Please set GUILE_EXECUTABLE.")
+ENDIF (NOT GUILE_EXECUTABLE)
 
 # ############################################################
 

Modified: gnucash/trunk/src/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/src/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -137,9 +137,7 @@
 ADD_SUBDIRECTORY (gnc-module)
 ADD_SUBDIRECTORY (engine)
 ADD_SUBDIRECTORY (backend/xml)
-IF (NOT MSVC)
-  ADD_SUBDIRECTORY (business/business-core)
-ENDIF (NOT MSVC)
+ADD_SUBDIRECTORY (business/business-core)
 
 ADD_SUBDIRECTORY (gnc)
 

Modified: gnucash/trunk/src/backend/xml/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/backend/xml/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/src/backend/xml/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -4,7 +4,7 @@
 
 INCLUDE_DIRECTORIES (${GCONF2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES (${LIBGUILE_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${LIBXML2_INCLUDE_DIR})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})

Modified: gnucash/trunk/src/business/business-core/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/business/business-core/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/src/business/business-core/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -6,7 +6,7 @@
 INCLUDE_DIRECTORIES (${GCONF2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${LIBGUILE_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBXML2_INCLUDE_DIR})
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h

Modified: gnucash/trunk/src/core-utils/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/core-utils/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/src/core-utils/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -6,7 +6,7 @@
 INCLUDE_DIRECTORIES (${GCONF2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${LIBGUILE_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}/..) # for gnc-ui.h
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}/../libqof/qof) # for gnc-ui.h

Modified: gnucash/trunk/src/engine/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/engine/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/src/engine/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -5,7 +5,7 @@
 INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${LIBGUILE_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/libqof/qof) # for qof.h

Modified: gnucash/trunk/src/gnc/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/gnc/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/src/gnc/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -47,7 +47,7 @@
 INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${LIBGUILE_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/libqof/qof) # for qof.h
@@ -73,7 +73,7 @@
 TARGET_LINK_LIBRARIES (cutecash engine gnc-module core-utils qof)
 TARGET_LINK_LIBRARIES (cutecash ${GCONF2_LIBRARIES})
 TARGET_LINK_LIBRARIES (cutecash ${GTHREAD_LIBRARIES} ${GOBJECT_LIBRARIES} ${GMODULE_LIBRARIES} ${GLIB2_LIBRARIES})
-TARGET_LINK_LIBRARIES (cutecash ${LIBGUILE_LIBRARIES})
+TARGET_LINK_LIBRARIES (cutecash ${GUILE_LIBRARIES})
 TARGET_LINK_LIBRARIES (cutecash ${LIBXML2_LIBRARIES})
 TARGET_LINK_LIBRARIES (cutecash ${ZLIB_LIBRARIES})
 IF (WIN32)

Modified: gnucash/trunk/src/gnc-module/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/gnc-module/CMakeLists.txt	2010-03-06 10:40:53 UTC (rev 18848)
+++ gnucash/trunk/src/gnc-module/CMakeLists.txt	2010-03-06 11:00:54 UTC (rev 18849)
@@ -5,7 +5,7 @@
 INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${LIBGUILE_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h
 INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}) # when building swig-gnc-module.c



More information about the gnucash-changes mailing list