Cmake: More cleanup moved all known paths into ConfigPaths.cmake and temp Linking...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c552147ef4232b44bc47f3a3d7af58809bea35b5..5af631808aab38a115874673b3dcad047946cffd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
 PROJECT(inkscape CXX C)\r
 \r
-MESSAGE(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")\r
-\r
 SET(INKSCAPE_VERSION 0.46+devel)\r
 SET(PROJECT_NAME inkscape)\r
 SET(CMAKE_BACKWARDS_COMPATIBILITY 2.4)\r
@@ -14,25 +12,12 @@ SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 SET(CMAKE_COLOR_MAKEFILE ON)\r
 #Choose verbosity level\r
 SET(CMAKE_VERBOSE_MAKEFILE OFF)\r
-\r
-# Probably best to move all these path things to a single file\r
-IF(WIN32)\r
-    SET(PACKAGE_LOCALE_DIR "locale")\r
-ELSEIF(WIN32)\r
-    # TODO: check and change this to correct value:\r
-    SET(PACKAGE_LOCALE_DIR "locale")\r
-ENDIF(WIN32)\r
-\r
-\r
-SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)\r
-SET(CMAKE_SKIP_RPATH:BOOL OFF)\r
-SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)\r
+
+SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeScripts)
+INCLUDE(ConfigPaths)\r
 INCLUDE(ConfigCompileFlags)\r
 INCLUDE(ConfigInkscapeDepends)\r
 \r
-INCLUDE_DIRECTORIES ("${PROJECT_SOURCE_DIR}" src/)\r
-LINK_DIRECTORIES (src/)\r
-\r
 #SET(CMAKE_MAJOR_MINOR "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")\r
 #IF("${CMAKE_MAJOR_MINOR}" STREQUAL "2.2")\r
 #    SET(CMAKE_AR "ar")\r
@@ -65,5 +50,4 @@ po
 \r
 FOREACH(dirlist ${folders})\r
 ADD_SUBDIRECTORY(${dirlist})\r
-ENDFOREACH(dirlist)\r
-\r
+ENDFOREACH(dirlist)

diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index 679af6c92e3568da1bf00560c1debeac3949cc49..d100dd4662221b5b222ac988520c259760a7ebca 100644 (file)
--- a/CMakeScripts/ConfigCompileFlags.cmake
+++ b/CMakeScripts/ConfigCompileFlags.cmake
@@ -23,4 +23,8 @@ 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} ")
+#Linking check
+message(STATUS "@XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+message(STATUS "${INKSCAPE_LINK_FLAGS}")
+message(STATUS "@XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index af826ed1f61671a0f67912278aa8ee9f41ede8a5..bd2edfc482c43a82857178b132a748e17d2b3a3b 100644 (file)
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -41,7 +41,7 @@ FOREACH(dep ${INKSCAPE_DEPENDS})
         message(STATUS "${dep}: FOUND")\r
         # Set Compiler Flags\r
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")\r
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${dep_name}_CFLAGS}")\r
+#        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${dep_name}_CFLAGS}")\r
         SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${dep_name}_LINK_FLAGS}")\r
     ELSE("${dep}_FOUND")\r
         message(STATUS "${dep}: NOT FOUND")\r
@@ -65,7 +65,8 @@ FOREACH(opt ${INKSCAPE_OPTIONAL})
 #    PKGCONFIG_VERSION(${opt} "${opt}_VERSION")\r
     IF("${opt}_FOUND")\r
         message(STATUS "${opt}: FOUND")\r
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")\r
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${opt_name}_CFLAGS}")
+#        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${opt_name}_CFLAGS}")\r
         SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${opt_name}_LINK_FLAGS}")\r
     ELSE("${opt}_FOUND")\r
         message(STATUS "${opt}: NOT FOUND")\r
@@ -146,5 +147,8 @@ 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")\r
-INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}")  # Include base dir, so other files can refer to the generated files.\r
-# CMAKE_INCLUDE_CURRENT_DIR is not enough as it only includes the current dir and not the basedir with config.h in it
+
+#Linking check
+message(STATUS "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+message(STATUS "${INKSCAPE_LINK_FLAGS}")
+message(STATUS "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")

diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
new file mode 100644 (file)
index 0000000..ec3985e
--- /dev/null
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -0,0 +1,29 @@
+MESSAGE(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")\r
+\r
+IF(WIN32)\r
+    SET(PACKAGE_LOCALE_DIR "locale")\r
+ELSEIF(WIN32)\r
+    # TODO: check and change this to correct value:\r
+    SET(PACKAGE_LOCALE_DIR "locale")\r
+ENDIF(WIN32)\r
+\r
+SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)\r
+SET(CMAKE_SKIP_RPATH:BOOL OFF)\r
+
+# 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/)  \r
+LINK_DIRECTORIES ("${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/)\r
+
+#INSTALL(TARGETS INKSCAPE\r
+#  RUNTIME DESTINATION bin\r
+#  LIBRARY DESTINATION lib\r
+#  ARCHIVE DESTINATION lib\r
+#)\r
+\r
+#FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")\r
+#INSTALL(FILES ${files} DESTINATION include/INKSCAPE/INKSCAPE)\r
+\r
+#CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/INKSCAPE.pc.in\r
+#                ${CMAKE_BINARY_DIR}/INKSCAPE.pc @ONLY IMMEDIATE )\r
+#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)\r

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 094653cb67d93fc3d7929279caa1fbaf4fb7777b..4984daa17e3a3515d06f8c943e9c9ab0aa47850f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -601,8 +601,7 @@ version.cpp
 version.h
 zoom-context.cpp
 zoom-context.h\r
-${ONLY_WIN}
-\r
+${ONLY_WIN}\r
 )\r
 \r
 # make executable for INKSCAPE\r
@@ -616,15 +615,4 @@ ADD_EXECUTABLE(inkview inkview.cpp)
 TARGET_LINK_LIBRARIES(inkview\r
        "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot\r
 )\r
-#INSTALL(TARGETS INKSCAPE\r
-#  RUNTIME DESTINATION bin\r
-#  LIBRARY DESTINATION lib\r
-#  ARCHIVE DESTINATION lib\r
-#)\r
-\r
-#FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")\r
-#INSTALL(FILES ${files} DESTINATION include/INKSCAPE/INKSCAPE)\r
-\r
-#CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/INKSCAPE.pc.in\r
-#                ${CMAKE_BINARY_DIR}/INKSCAPE.pc @ONLY IMMEDIATE )\r
-#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)\r
+

diff --git a/src/dom/CMakeLists.txt b/src/dom/CMakeLists.txt
index 30685be03801b31db4044a1b23ec5485128c364a..645999e0c18c1c58c46626b3b5b909c960f69074 100644 (file)
--- a/src/dom/CMakeLists.txt
+++ b/src/dom/CMakeLists.txt
@@ -1,20 +1,47 @@
 SET(dom_SRC
-cssparser.cpp
+css.h
+cssreader.cpp
+cssreader.h
+dom.h
 domimpl.cpp
+domimpl.h
 domptr.cpp
+domptr.h
 domstring.cpp
+domstring.h
+events.h
+ls.h
 lsimpl.cpp
+lsimpl.h
 prop-css2.cpp
 prop-css.cpp
 prop-svg.cpp
+smil.h
 smilimpl.cpp
+smilimpl.h
+stylesheets.h
+svg.h
 svgimpl.cpp
-svgparser.cpp
+svgimpl.h
+svgreader.cpp
+svgreader.h
+svgtypes.h
+traversal.h
 ucd.cpp
+ucd.h
 uri.cpp
+uri.h
+views.h
+views-level3.h
 xmlreader.cpp
+xmlreader.h
 xmlwriter.cpp
+xmlwriter.h
+xpath.h
 xpathimpl.cpp
+xpathimpl.h
 xpathparser.cpp
+xpathparser.h
 xpathtoken.cpp
+xpathtoken.h
 )