diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-06-14 23:31:50 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-06-14 23:31:50 +0000 |
| commit | 8a67b4e32a65f370024a8cdab973e6d3c37168ce (patch) | |
| tree | 933140d9271c512b0e8f100ffe57ceabe1a8d3ab | |
| parent | Improve "can't find" error msg for pkgconfig (diff) | |
| download | inkscape-8a67b4e32a65f370024a8cdab973e6d3c37168ce.tar.gz inkscape-8a67b4e32a65f370024a8cdab973e6d3c37168ce.zip | |
Cmake: fix config.h not being found
(bzr r5944)
| -rw-r--r-- | CMakeScripts/ConfigChecks.cmake | 1 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 1 | ||||
| -rw-r--r-- | CMakeScripts/FindBoost.cmake | 2 | ||||
| -rw-r--r-- | src/libavoid/CMakeLists.txt | 15 |
4 files changed, 2 insertions, 17 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 184239cd8..026fa5d01 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -68,3 +68,4 @@ ENDIF(HAVE_CAIRO_PDF) # Create them in the binary root dir
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
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 3ca3695fe..1a690abd3 100644 --- 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 20bf27ab8..b1a83803a 100644 --- 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 403ceca73..db24527f1 100644 --- 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}) |