Cmake: Correct INKSCAPE_LIBDIR value in config.h.cmake, to correct compiling issue...

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 88a95636d8ab73970488925939cf566f463d045c..47224ecd680b668496cd796c5bd58bc83309ae2c 100644 (file)
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -88,36 +88,36 @@ INCLUDE (CheckStructMember)
 # usage: CHECK_FUNCTION_EXISTS (<function name> <RESULT_VARIABLE> )\r
 # usage: CHECK_STRUCT_MEMBER (<struct> <member> <header> <RESULT_VARIABLE>)\r
 \r
-CHECK_INCLUDE_FILES (boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP)\r
-CHECK_INCLUDE_FILES (cairo-pdf.h HAVE_CAIRO_PDF)\r
+CHECK_INCLUDE_FILES(boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP)\r
+CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF)\r
 CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR)\r
 CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK)\r
-CHECK_INCLUDE_FILES (gc/gc.h HAVE_GC_GC_H)\r
-CHECK_INCLUDE_FILES (gc.h HAVE_GC_H)\r
-CHECK_INCLUDE_FILES (getopt.h HAVE_GETOPT_H)\r
+CHECK_INCLUDE_FILES(gc/gc.h HAVE_GC_GC_H)\r
+CHECK_INCLUDE_FILES(gc.h HAVE_GC_H)\r
+CHECK_INCLUDE_FILES(getopt.h HAVE_GETOPT_H)\r
 CHECK_FUNCTION_EXISTS(gettext HAVE_GETTEXT)\r
 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)\r
 CHECK_FUNCTION_EXISTS(gtk_window_fullscreen HAVE_GTK_WINDOW_FULLSCREEN)\r
 CHECK_FUNCTION_EXISTS(gtk_window_set_default_icon_from_file HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE)\r
-CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)\r
-CHECK_INCLUDE_FILES (inttypes.h HAVE_INTTYPES_H)\r
-CHECK_INCLUDE_FILES (locale.h HAVE_LC_MESSAGES)\r
-CHECK_INCLUDE_FILES (locale.h HAVE_LOCALE_H)\r
-CHECK_INCLUDE_FILES (libintl.h HAVE_LIBINTL_H)\r
-CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)\r
+CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H)\r
+CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)\r
+CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES)\r
+CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H)\r
+CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)\r
+CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H)\r
 CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)\r
-CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)\r
+CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H)\r
 CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)\r
-CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)\r
+CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H)\r
 CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)\r
 CHECK_FUNCTION_EXISTS(mkdir HAVE_MKDIR)\r
 CHECK_FUNCTION_EXISTS(pow HAVE_POW)\r
 CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT)\r
-CHECK_INCLUDE_FILES (stddef.h HAVE_STDDEF_H)\r
-CHECK_INCLUDE_FILES (stdint.h HAVE_STDINT_H)\r
-CHECK_INCLUDE_FILES (stdlib.h HAVE_STDLIB_H)\r
-CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)\r
-CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)\r
+CHECK_INCLUDE_FILES(stddef.h HAVE_STDDEF_H)\r
+CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)\r
+CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H)\r
+CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)\r
+CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)\r
 CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP)\r
 CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)\r
 CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)\r
@@ -129,14 +129,14 @@ CHECK_STRUCT_MEMBER(fsmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_FSMBLKS)
 CHECK_STRUCT_MEMBER(hblkhd mallinfo malloc.h HAVE_STRUCT_MALLINFO_HBLKHD)\r
 CHECK_STRUCT_MEMBER(uordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_UORDBLKS)\r
 CHECK_STRUCT_MEMBER(usmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_USMBLKS)\r
-CHECK_INCLUDE_FILES (sys/filio.h HAVE_SYS_FILIO_H)\r
-CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)\r
-CHECK_INCLUDE_FILES (sys/time.h HAVE_SYS_TIME_H)\r
-CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)\r
-CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)\r
-CHECK_INCLUDE_FILES (zlib.h HAVE_ZLIB_H)\r
+CHECK_INCLUDE_FILES(sys/filio.h HAVE_SYS_FILIO_H)\r
+CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)\r
+CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)\r
+CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)\r
+CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)\r
+CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)\r
 \r
-# Enable pango defines, necessary for compilation on Win32, how about Linux?\r
+#Enable pango defines, necessary for compilation on Win32, how about Linux?\r
 IF (HAVE_CAIRO_PDF)\r
     SET(PANGO_ENABLE_ENGINE TRUE)\r
     SET(RENDER_WITH_PANGO_CAIRO TRUE)\r
@@ -147,4 +147,4 @@ ENDIF(HAVE_CAIRO_PDF)
 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
\ No newline at end of file
+# CMAKE_INCLUDE_CURRENT_DIR is not enough as it only includes the current dir and not the basedir with config.h in it

diff --git a/config.h.cmake b/config.h.cmake
index 5ca64d76923e2aa422d74a985e01fce473d1b2b2..8c888726b7392946811e6fb550985cf26f176f5a 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -205,7 +205,7 @@
 #define INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share"
 
 /* Base library directory -- only path-prefix.h should use it! */
-#cmakedefine INKSCAPE_LIBDIR
+#define INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib"
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */

diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt
index f61418efedcfba663fcb69388af0879ef1d6dd9a..501f1137515fac0e372cf0c204635a5d76ef260b 100644 (file)
--- a/src/helper/CMakeLists.txt
+++ b/src/helper/CMakeLists.txt
@@ -15,5 +15,5 @@ unit-tracker.cpp
 window.cpp
 sp-marshal.list
 # we generate this file and it's .h counter-part
-sp-marshal.cpp
+#sp-marshal.cpp
 )