added a Modules cmake dir, only use for find_package, reference cmake include paths explicitly.

(bzr r10358)

13 files changed, 9 insertions, 7 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54bb62775..da207016a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@
 # ideasman42
 
 cmake_minimum_required(VERSION 2.8.0)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts/Modules")
 
 project(inkscape)
 
@@ -40,9 +40,9 @@ option(WITH_DBUS "Compile with support for DBus interface" OFF)
 
 option(WITH_PROFILING "Turn on profiling" OFF) # Set to true if compiler/linker should enable profiling
 
-include(ConfigPaths) # Installation Paths
-include(DefineDependsandFlags) # Includes, Compiler Flags, and Link Libraries
-include(HelperMacros) # Misc Utility Macros
+include(CMakeScripts/ConfigPaths.cmake) # Installation Paths
+include(CMakeScripts/DefineDependsandFlags.cmake) # Includes, Compiler Flags, and Link Libraries
+include(CMakeScripts/HelperMacros.cmake) # Misc Utility Macros
 
 
 
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d0547bb49..96ff53ff9 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -141,7 +141,7 @@ if(ImageMagick_FOUND)
 	list(APPEND INKSCAPE_LIBS ${ImageMagick_Magick++_LIBRARY})
 endif()
 
-include(IncludeJava)
+include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake)
 # end Dependencies
 
 
@@ -152,4 +152,4 @@ include_directories(SYSTEM ${INKSCAPE_INCS_SYS})
 unset(INKSCAPE_INCS)
 unset(INKSCAPE_INCS_SYS)
 
-include(ConfigChecks)
+include(${CMAKE_CURRENT_LIST_DIR}/ConfigChecks.cmake)
diff --git a/CMakeScripts/FindBoehmGC.cmake b/CMakeScripts/Modules/FindBoehmGC.cmake
index 7a5081c22..7a5081c22 100644
--- a/CMakeScripts/FindBoehmGC.cmake
+++ b/CMakeScripts/Modules/FindBoehmGC.cmake
diff --git a/CMakeScripts/FindGSL.cmake b/CMakeScripts/Modules/FindGSL.cmake
index 1ef4643ad..1ef4643ad 100644
--- a/CMakeScripts/FindGSL.cmake
+++ b/CMakeScripts/Modules/FindGSL.cmake
diff --git a/CMakeScripts/FindGTK2_patched.cmake b/CMakeScripts/Modules/FindGTK2_patched.cmake
index 91249b787..91249b787 100644
--- a/CMakeScripts/FindGTK2_patched.cmake
+++ b/CMakeScripts/Modules/FindGTK2_patched.cmake
diff --git a/CMakeScripts/FindGnomeVFS2.cmake b/CMakeScripts/Modules/FindGnomeVFS2.cmake
index d942addac..d942addac 100644
--- a/CMakeScripts/FindGnomeVFS2.cmake
+++ b/CMakeScripts/Modules/FindGnomeVFS2.cmake
diff --git a/CMakeScripts/FindLCMS.cmake b/CMakeScripts/Modules/FindLCMS.cmake
index a69d88a42..a69d88a42 100644
--- a/CMakeScripts/FindLCMS.cmake
+++ b/CMakeScripts/Modules/FindLCMS.cmake
diff --git a/CMakeScripts/FindLibWPG.cmake b/CMakeScripts/Modules/FindLibWPG.cmake
index 0d83cddee..0d83cddee 100644
--- a/CMakeScripts/FindLibWPG.cmake
+++ b/CMakeScripts/Modules/FindLibWPG.cmake
diff --git a/CMakeScripts/FindPANGOMM.cmake b/CMakeScripts/Modules/FindPANGOMM.cmake
index 953c49ef0..953c49ef0 100644
--- a/CMakeScripts/FindPANGOMM.cmake
+++ b/CMakeScripts/Modules/FindPANGOMM.cmake
diff --git a/CMakeScripts/FindPopt.cmake b/CMakeScripts/Modules/FindPopt.cmake
index e1368be75..e1368be75 100644
--- a/CMakeScripts/FindPopt.cmake
+++ b/CMakeScripts/Modules/FindPopt.cmake
diff --git a/CMakeScripts/FindPython.cmake b/CMakeScripts/Modules/FindPython.cmake
index 1ac451541..1ac451541 100644
--- a/CMakeScripts/FindPython.cmake
+++ b/CMakeScripts/Modules/FindPython.cmake
diff --git a/CMakeScripts/FindSigC++.cmake b/CMakeScripts/Modules/FindSigC++.cmake
index ed0abc545..ed0abc545 100644
--- a/CMakeScripts/FindSigC++.cmake
+++ b/CMakeScripts/Modules/FindSigC++.cmake
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index 8137487e2..1d6a82e41 100644
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-include(UseGlibMarshal)
+include(${CMAKE_SOURCE_DIR}/CMakeScripts/UseGlibMarshal.cmake)
 
 GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper")
 
@@ -46,5 +46,7 @@ set(helper_SRC
 	window.h
 )
 
+set_source_files_properties(sp_marshal_SRC PROPERTIES GENERATED true)
+
 # add_inkscape_lib(helper_LIB "${helper_SRC}")
 add_inkscape_source("${helper_SRC}")