From: verbalshadow Date: Sat, 31 May 2008 14:38:51 +0000 (+0000) Subject: Cmake: added windows path to find modules. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2823f12b1dfc12f7d5ea207b216a7488b0fce3aa;p=inkscape.git Cmake: added windows path to find modules. --- diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index 82dbce88c..184239cd8 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -9,7 +9,7 @@ INCLUDE (CheckStructMember) # usage: CHECK_FUNCTION_EXISTS ( ) # usage: CHECK_STRUCT_MEMBER (
) -CHECK_INCLUDE_FILES(concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP) +CHECK_INCLUDE_FILES(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP) CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF) CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR) CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake index d4ed503cb..bc3b42ef6 100644 --- a/CMakeScripts/ConfigCompileFlags.cmake +++ b/CMakeScripts/ConfigCompileFlags.cmake @@ -22,4 +22,4 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_PROFILING_FLAGS} ") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILE_PROFILING_FLAGS} ") SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} ") -message(STATUS "${CMAKE_CXX_FLAGS}") +#message(STATUS "${CMAKE_CXX_FLAGS}") diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 5dbc1bf5e..3ca3695fe 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -2,7 +2,7 @@ # Include dependencies: find_package(GTK2 REQUIRED) find_package(GtkMM REQUIRED) -#find_package(SigC++ REQUIRED) +find_package(SigC++ REQUIRED) find_package(XML2 REQUIRED) find_package(XSLT REQUIRED) find_package(GSL REQUIRED) @@ -17,12 +17,12 @@ find_package(Popt REQUIRED) find_package(OpenSSL) INCLUDE(IncludeJava) # end Dependencies -Message(STATUS "${GTKMM_LIBRARIES}-----${GTKMM_INCLUDE_DIRS}") + #Linking -SET(INKSCAPE_LIBS +LIST(APPEND INKSCAPE_LIBS "${GTK2_LIBRARIES}" "${GTKMM_LIBRARIES}" -#"${SIGC++_LIBRARIES}" +"${SIGC++_LIBRARIES}" "${XML2_LIBRARIES}" "${XSLT_LIBRARIES}" "${IMAGEMAGICK++_LIBRARIES}" @@ -37,9 +37,12 @@ SET(INKSCAPE_LIBS #Includes INCLUDE_DIRECTORIES( +${CMAKE_BINARY_DIR} +${PROJECT_SOURCE_DIR} +"${CMAKE_BINARY_DIR}/src" ${GTK2_INCLUDE_DIRS} ${GTKMM_INCLUDE_DIRS} -#${SIGC++_INCLUDE_DIRS} +${SIGC++_INCLUDE_DIRS} ${XML2_INCLUDE_DIRS} ${XSLT_INCLUDE_DIRS} ${IMAGEMAGICK++_INCLUDE_DIRS} @@ -50,9 +53,6 @@ ${BOEHMGC_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS} ${POPT_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} -${CMAKE_BINARY_DIR} -${PROJECT_SOURCE_DIR} -${CMAKE_BINARY_DIR}/src ) #C/C++ Flags #SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${BOOST_INCLUDE_DIR} ") diff --git a/CMakeScripts/FindBoehmGC.cmake b/CMakeScripts/FindBoehmGC.cmake index 9429655e3..7a5081c22 100644 --- a/CMakeScripts/FindBoehmGC.cmake +++ b/CMakeScripts/FindBoehmGC.cmake @@ -26,6 +26,7 @@ else (BOEHMGC_LIBRARIES AND BOEHMGC_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES gc ) diff --git a/CMakeScripts/FindFreetype2.cmake b/CMakeScripts/FindFreetype2.cmake index 159b0a1c7..140dbd6c0 100644 --- a/CMakeScripts/FindFreetype2.cmake +++ b/CMakeScripts/FindFreetype2.cmake @@ -38,6 +38,7 @@ else (FREETYPE2_LIBRARIES AND FREETYPE2_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES freetype2 ) diff --git a/CMakeScripts/FindGSL.cmake b/CMakeScripts/FindGSL.cmake index edadc52bd..0297f7375 100644 --- a/CMakeScripts/FindGSL.cmake +++ b/CMakeScripts/FindGSL.cmake @@ -38,6 +38,7 @@ else (GSL_LIBRARIES AND GSL_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES gsl ) diff --git a/CMakeScripts/FindGTK2.cmake b/CMakeScripts/FindGTK2.cmake index d3e22ef73..1224b082b 100644 --- a/CMakeScripts/FindGTK2.cmake +++ b/CMakeScripts/FindGTK2.cmake @@ -90,6 +90,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) /usr/include/gtk-2.0 /usr/local/include/gtk-2.0 /opt/gnome/include/gtk-2.0 + $ENV{DEVLIBS_PATH}//include// ) # Some Linux distributions (e.g. Red Hat) have glibconfig.h @@ -113,6 +114,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) /opt/gnome/lib/glib-2.0/include /usr/lib64/glib-2.0/include /usr/lib/glib-2.0/include + $ENV{DEVLIBS_PATH}//include// ) #MESSAGE(STATUS "DEBUG: GTK2_GLIBCONFIG_INCLUDE_PATH = ${GTK2_GLIBCONFIG_INCLUDE_PATH}") @@ -120,6 +122,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ${_GLIB2_INCLUDEDIR} /opt/gnome/include/glib-2.0 /usr/include/glib-2.0 + $ENV{DEVLIBS_PATH}//include// ) #MESSAGE(STATUS "DEBUG: GTK2_GLIBCONFIG_INCLUDE_PATH = ${GTK2_GLIBCONFIG_INCLUDE_PATH}") @@ -129,6 +132,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) /usr/local/include /usr/openwin/share/include /opt/gnome/include + $ENV{DEVLIBS_PATH}//include// ) if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) @@ -143,6 +147,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ${_PANGO_INCLUDEDIR} /opt/gnome/include/pango-1.0 /usr/include/pango-1.0 + $ENV{DEVLIBS_PATH}//include// ) if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) @@ -159,6 +164,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) /opt/gnome/lib64/gtk-2.0/include /usr/lib/gtk-2.0/include /usr/lib64/gtk-2.0/include + $ENV{DEVLIBS_PATH}//include// ) if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) @@ -174,6 +180,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) /opt/gnome/include/cairo /usr/include /usr/include/cairo + $ENV{DEVLIBS_PATH}//include// ) #MESSAGE(STATUS "DEBUG: GTK2_CAIRO_INCLUDE_PATH = ${GTK2_CAIRO_INCLUDE_PATH}") @@ -189,6 +196,7 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS) ${_ATK_INCLUDEDIR} /opt/gnome/include/atk-1.0 /usr/include/atk-1.0 + $ENV{DEVLIBS_PATH}//include// ) #MESSAGE(STATUS "DEBUG: GTK2_ATK_INCLUDE_PATH = ${GTK2_ATK_INCLUDE_PATH}") diff --git a/CMakeScripts/FindGnomeVFS2.cmake b/CMakeScripts/FindGnomeVFS2.cmake index 5c575001a..d942addac 100644 --- a/CMakeScripts/FindGnomeVFS2.cmake +++ b/CMakeScripts/FindGnomeVFS2.cmake @@ -38,6 +38,7 @@ else (GNOMEVFS2_LIBRARIES AND GNOMEVFS2_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES gnome-vfs-2.0 ) diff --git a/CMakeScripts/FindGtkMM.cmake b/CMakeScripts/FindGtkMM.cmake index b98c19834..ff7232d80 100644 --- a/CMakeScripts/FindGtkMM.cmake +++ b/CMakeScripts/FindGtkMM.cmake @@ -48,6 +48,7 @@ FOREACH(_SUBLIB ${SubLibs}) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES ${_SUBLIB} ) diff --git a/CMakeScripts/FindImageMagick++.cmake b/CMakeScripts/FindImageMagick++.cmake index 57cac14d3..b12acdffc 100644 --- a/CMakeScripts/FindImageMagick++.cmake +++ b/CMakeScripts/FindImageMagick++.cmake @@ -38,6 +38,7 @@ else (IMAGEMAGICK++_LIBRARIES AND IMAGEMAGICK++_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES Magick++ ) diff --git a/CMakeScripts/FindLCMS.cmake b/CMakeScripts/FindLCMS.cmake index 7285d0a36..a69d88a42 100644 --- a/CMakeScripts/FindLCMS.cmake +++ b/CMakeScripts/FindLCMS.cmake @@ -38,6 +38,7 @@ else (LCMS_LIBRARIES AND LCMS_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES lcms ) diff --git a/CMakeScripts/FindLibWPG.cmake b/CMakeScripts/FindLibWPG.cmake index 5d02f36ac..0d83cddee 100644 --- a/CMakeScripts/FindLibWPG.cmake +++ b/CMakeScripts/FindLibWPG.cmake @@ -38,6 +38,7 @@ else (LIBWPG_LIBRARIES AND LIBWPG_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES libwpg-0.1 ) diff --git a/CMakeScripts/FindPopt.cmake b/CMakeScripts/FindPopt.cmake index 5068bbfa9..e1368be75 100644 --- a/CMakeScripts/FindPopt.cmake +++ b/CMakeScripts/FindPopt.cmake @@ -38,6 +38,7 @@ else (POPT_LIBRARIES AND POPT_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES popt ) diff --git a/CMakeScripts/FindSigC++.cmake b/CMakeScripts/FindSigC++.cmake index ab0c37b4b..0f3b70db6 100644 --- a/CMakeScripts/FindSigC++.cmake +++ b/CMakeScripts/FindSigC++.cmake @@ -29,18 +29,28 @@ else (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) pkg_check_modules(_SIGC++ sigc++-2.0) endif (PKG_CONFIG_FOUND) endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4) - find_path(SIGC++_INCLUDE_DIR - NAMES - sigc++/sigc++.h - PATHS +SET(_DIR_LIST ${_SIGC++_INCLUDEDIR} /usr/include /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// + ) +FOREACH(_TEST_PATH ${_DIR_LIST}) + find_path(${_TEST_PATH}_INCLUDE_DIR + NAMES + sigc++/sigc++.h + sigc++config.h + PATHS + ${_TEST_PATH} PATH_SUFFIXES sigc++-2.0 ) + LIST(APPEND SIGC++_INCLUDE_DIRS + ${${_TEST_PATH}_INCLUDE_DIR} + ) +ENDFOREACH(_TEST_PATH) find_library(SIGC-2.0_LIBRARY NAMES @@ -57,10 +67,6 @@ else (SIGC++_LIBRARIES AND SIGC++_INCLUDE_DIRS) set(SIGC-2.0_FOUND TRUE) endif (SIGC-2.0_LIBRARY) - set(SIGC++_INCLUDE_DIRS - ${SIGC++_INCLUDE_DIR} - ) - if (SIGC-2.0_FOUND) set(SIGC++_LIBRARIES ${SIGC++_LIBRARIES} diff --git a/CMakeScripts/FindXML2.cmake b/CMakeScripts/FindXML2.cmake index f7dfe9e7f..1e2b0d3af 100644 --- a/CMakeScripts/FindXML2.cmake +++ b/CMakeScripts/FindXML2.cmake @@ -38,6 +38,7 @@ else (XML2_LIBRARIES AND XML2_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES libxml2 ) diff --git a/CMakeScripts/FindXSLT.cmake b/CMakeScripts/FindXSLT.cmake index 0bce409cd..bda46e640 100644 --- a/CMakeScripts/FindXSLT.cmake +++ b/CMakeScripts/FindXSLT.cmake @@ -38,6 +38,7 @@ else (XSLT_LIBRARIES AND XSLT_INCLUDE_DIRS) /usr/local/include /opt/local/include /sw/include + $ENV{DEVLIBS_PATH}//include// PATH_SUFFIXES libxslt ) diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt index 7d3221357..36c37e120 100644 --- a/src/live_effects/CMakeLists.txt +++ b/src/live_effects/CMakeLists.txt @@ -19,6 +19,7 @@ lpegroupbbox.cpp lpegroupbbox.h lpe-knot.cpp lpe-knot.h +lpe-lattice.h lpe-lattice.cpp lpeobject.cpp lpeobject.h