Cmake: More Dependency work, added new files

(bzr r5754)

5 files changed, 45 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23ced3364..e3327eb2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ SET(PROJECT_NAME inkscape)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6)

 SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)

 

-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
+LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeScripts")
 INCLUDE(ConfigPaths)
 INCLUDE(DefineDependsandFlags)

 INCLUDE(HelperMacros)
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 7e73a761b..651df5bbf 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -8,12 +8,12 @@ ELSEIF(WIN32)
 ENDIF(WIN32)

 

 SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)

-SET(CMAKE_SKIP_RPATH:BOOL OFF)

+SET(CMAKE_SKIP_RPATH:BOOL OFF)
 
 # Include base dir, so other files can refer to the generated files.
 # CMAKE_INCLUDE_CURRENT_DIR is not enough as it only includes the current dir and not the basedir with config.h in it
 #INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/)  

-LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/)

+#LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/)

 
 #INSTALL(TARGETS INKSCAPE

 #  RUNTIME DESTINATION bin

@@ -26,4 +26,6 @@ LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_
 

 #CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/INKSCAPE.pc.in

 #                ${CMAKE_BINARY_DIR}/INKSCAPE.pc @ONLY IMMEDIATE )

-#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)

+#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)
+
+#SET(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL  "Where to put the executables")set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL  "Where to put the libraries")

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d73554a5d..8a82b6214 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)
@@ -18,31 +18,44 @@ find_package(OpenSSL)
 INCLUDE(IncludeJava)

 # end Dependencies
 
+#Linking 

+SET(INKSCAPE_LIBS 
+"${GTK2_LIBRARIES}"
+"${GTKMM_LIBRARIES}"
+#"${SIGC++_LIBRARIES}"
+"${XML2_LIBRARIES}"
+"${XSLT_LIBRARIES}"
+"${IMAGEMAGICK++_LIBRARIES}"
+"${FREETYPE2_LIBRARIES}"
+"${GNOMEVFS2_LIBRARIES}"
+"${BOOST_LIBRARIES}"
+"${BOEHMGC_LIBRARIES}"
+"${PNG_LIBRARIES}"
+"${POPT_LIBRARIES}"
+"${OPENSSL_LIBRARIES}"
+)
+
 #Includes 
-

 INCLUDE_DIRECTORIES( 
-"${GTK2_INCLUDE_DIRS}"
-"${GtkMM_INCLUDE_DIRS}"
-"${SigC++_INCLUDE_DIRS}"
-"${XML2_INCLUDE_DIRS}"
-"${XSLT_INCLUDE_DIRS}"
-"${ImageMagick++_INCLUDE_DIRS}"
-"${Freetype2_INCLUDE_DIRS}"
-"${GnomeVFS2_INCLUDE_DIRS}"
-"${Boost_INCLUDE_DIRS}"
-"${BoehmGC_INCLUDE_DIRS}"
-"${PNG_INCLUDE_DIRS}"
-"${Popt_INCLUDE_DIRS}"
-"${OpenSSL_INCLUDE_DIRS}"
-"${CMAKE_BINARY_DIR}"
-"${PROJECT_SOURCE_DIR}"
- src/
+${GTK2_INCLUDE_DIRS}
+${GTKMM_INCLUDE_DIRS}
+#${SIGC++_INCLUDE_DIRS}
+${XML2_INCLUDE_DIRS}
+${XSLT_INCLUDE_DIRS}
+${IMAGEMAGICK++_INCLUDE_DIRS}
+${FREETYPE2_INCLUDE_DIRS}
+${GNOMEVFS2_INCLUDE_DIRS}
+${BOOST_INCLUDE_DIRS}
+${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} ")
-#Defines

-#SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM} -j2")
 
 #INCLUDE(ConfigCompileFlags)

 INCLUDE(ConfigChecks)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c4d475be..a6da5168f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -589,9 +589,9 @@ libvpsc
 livarot

 )

 

-FOREACH(dirlist ${libfolders})

-  ADD_SUBDIRECTORY(${dirlist})

-ENDFOREACH(dirlist)

+FOREACH(dirlistsrc ${libfolders})

+  ADD_SUBDIRECTORY(${dirlistsrc})

+ENDFOREACH(dirlistsrc)

 
 
 ADD_LIBRARY(sp STATIC ${SP_SRC})

@@ -599,7 +599,7 @@ ADD_LIBRARY(sp STATIC ${SP_SRC})
 # make executable for INKSCAPE

 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})

 TARGET_LINK_LIBRARIES(inkscape

-	"${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp

+	"${INKSCAPE_LIBS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot sp

 )
 
 # make executable for INKVIEW
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt
index f83269190..f8dc72afe 100644
--- a/src/display/CMakeLists.txt
+++ b/src/display/CMakeLists.txt
@@ -44,6 +44,7 @@ nr-filter-utils.cpp
 nr-light.cpp
 nr-plain-stuff.cpp
 nr-plain-stuff-gdk.cpp
+nr-svgfonts.h
 pixblock-scaler.cpp
 pixblock-transform.cpp
 snap-indicator.cpp