Cmake: fix config.h not being found

diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 184239cd8a3b337f32676b1b59c694a8cbf6ad29..026fa5d01570bba9834fd3a05728aa32bf940501 100644 (file)
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -68,3 +68,4 @@ ENDIF(HAVE_CAIRO_PDF)
 # Create them in the binary root dir\r
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)\r
 FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n")
+add_definitions(-DHAVE_CONFIG_H)

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 3ca3695fe1401861c1ee2631c6574908403bb5af..1a690abd309ec50295f5fca00cf659eb9f035e0a 100644 (file)
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -39,7 +39,6 @@ LIST(APPEND INKSCAPE_LIBS
 INCLUDE_DIRECTORIES( 
 ${CMAKE_BINARY_DIR}
 ${PROJECT_SOURCE_DIR}
-"${CMAKE_BINARY_DIR}/src"
 ${GTK2_INCLUDE_DIRS}
 ${GTKMM_INCLUDE_DIRS}
 ${SIGC++_INCLUDE_DIRS}

diff --git a/CMakeScripts/FindBoost.cmake b/CMakeScripts/FindBoost.cmake
index 20bf27ab8250d59d8c7976d6f6ed863696cf30f7..b1a83803ab14e18f40ef4e7a48df25c02dd40ba3 100644 (file)
--- a/CMakeScripts/FindBoost.cmake
+++ b/CMakeScripts/FindBoost.cmake
@@ -159,7 +159,7 @@ IF (_boost_IN_CACHE)
   FOREACH(COMPONENT ${Boost_FIND_COMPONENTS})
     STRING(TOUPPER ${COMPONENT} COMPONENT)
     _Boost_ADJUST_LIB_VARS( ${COMPONENT} )
-  FOREACH(COMPONENT)
+  ENDFOREACH(COMPONENT)
   SET(Boost_INCLUDE_DIRS ${Boost_INCLUDE_DIR})
 ELSE (_boost_IN_CACHE)
   # Need to search for boost

diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt
index 403ceca731ee6c8fcb03f5b20a95f5bd5a169514..db24527f1f1df52a95edf18d34c7335d7ef461d6 100644 (file)
--- a/src/libavoid/CMakeLists.txt
+++ b/src/libavoid/CMakeLists.txt
@@ -1,30 +1,15 @@
 SET(libavoid_SRC
 connector.cpp
-connector.h
-debug.h
 geometry.cpp
-geometry.h
-geomtypes.h
 graph.cpp
-graph.h
-libavoid.h
 makepath.cpp
-makepath.h
 polyutil.cpp
-polyutil.h
 region.cpp
-region.h
 router.cpp
-router.h
 shape.cpp
-shape.h
 static.cpp
-static.h
 timer.cpp
-timer.h
 vertices.cpp
-vertices.h
 visibility.cpp
-visibility.h
 )
 ADD_LIBRARY(avoid STATIC ${libavoid_SRC})