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

(bzr r5406)

3 files changed, 28 insertions, 28 deletions

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 88a95636d..47224ecd6 100644
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -88,36 +88,36 @@ INCLUDE (CheckStructMember)
 # usage: CHECK_FUNCTION_EXISTS (<function name> <RESULT_VARIABLE> )

 # usage: CHECK_STRUCT_MEMBER (<struct> <member> <header> <RESULT_VARIABLE>)

 

-CHECK_INCLUDE_FILES (boost/concept_check.hpp HAVE_BOOST_CONCEPT_CHECK_HPP)

-CHECK_INCLUDE_FILES (cairo-pdf.h HAVE_CAIRO_PDF)

+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)

-CHECK_INCLUDE_FILES (gc/gc.h HAVE_GC_GC_H)

-CHECK_INCLUDE_FILES (gc.h HAVE_GC_H)

-CHECK_INCLUDE_FILES (getopt.h HAVE_GETOPT_H)

+CHECK_INCLUDE_FILES(gc/gc.h HAVE_GC_GC_H)

+CHECK_INCLUDE_FILES(gc.h HAVE_GC_H)

+CHECK_INCLUDE_FILES(getopt.h HAVE_GETOPT_H)

 CHECK_FUNCTION_EXISTS(gettext HAVE_GETTEXT)

 CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)

 CHECK_FUNCTION_EXISTS(gtk_window_fullscreen HAVE_GTK_WINDOW_FULLSCREEN)

 CHECK_FUNCTION_EXISTS(gtk_window_set_default_icon_from_file HAVE_GTK_WINDOW_SET_DEFAULT_ICON_FROM_FILE)

-CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)

-CHECK_INCLUDE_FILES (inttypes.h HAVE_INTTYPES_H)

-CHECK_INCLUDE_FILES (locale.h HAVE_LC_MESSAGES)

-CHECK_INCLUDE_FILES (locale.h HAVE_LOCALE_H)

-CHECK_INCLUDE_FILES (libintl.h HAVE_LIBINTL_H)

-CHECK_INCLUDE_FILES (fcntl.h HAVE_FCNTL_H)

+CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H)

+CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H)

+CHECK_INCLUDE_FILES(locale.h HAVE_LC_MESSAGES)

+CHECK_INCLUDE_FILES(locale.h HAVE_LOCALE_H)

+CHECK_INCLUDE_FILES(libintl.h HAVE_LIBINTL_H)

+CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H)

 CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO)

-CHECK_INCLUDE_FILES (malloc.h HAVE_MALLOC_H)

+CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H)

 CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)

-CHECK_INCLUDE_FILES (memory.h HAVE_MEMORY_H)

+CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H)

 CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET)

 CHECK_FUNCTION_EXISTS(mkdir HAVE_MKDIR)

 CHECK_FUNCTION_EXISTS(pow HAVE_POW)

 CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT)

-CHECK_INCLUDE_FILES (stddef.h HAVE_STDDEF_H)

-CHECK_INCLUDE_FILES (stdint.h HAVE_STDINT_H)

-CHECK_INCLUDE_FILES (stdlib.h HAVE_STDLIB_H)

-CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)

-CHECK_INCLUDE_FILES (string.h HAVE_STRING_H)

+CHECK_INCLUDE_FILES(stddef.h HAVE_STDDEF_H)

+CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H)

+CHECK_INCLUDE_FILES(stdlib.h HAVE_STDLIB_H)

+CHECK_INCLUDE_FILES(strings.h HAVE_STRINGS_H)

+CHECK_INCLUDE_FILES(string.h HAVE_STRING_H)

 CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP)

 CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK)

 CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR)

@@ -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)

 CHECK_STRUCT_MEMBER(uordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_UORDBLKS)

 CHECK_STRUCT_MEMBER(usmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_USMBLKS)

-CHECK_INCLUDE_FILES (sys/filio.h HAVE_SYS_FILIO_H)

-CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)

-CHECK_INCLUDE_FILES (sys/time.h HAVE_SYS_TIME_H)

-CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)

-CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)

-CHECK_INCLUDE_FILES (zlib.h HAVE_ZLIB_H)

+CHECK_INCLUDE_FILES(sys/filio.h HAVE_SYS_FILIO_H)

+CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H)

+CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H)

+CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H)

+CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H)

+CHECK_INCLUDE_FILES(zlib.h HAVE_ZLIB_H)

 

-# Enable pango defines, necessary for compilation on Win32, how about Linux?

+#Enable pango defines, necessary for compilation on Win32, how about Linux?

 IF (HAVE_CAIRO_PDF)

     SET(PANGO_ENABLE_ENGINE TRUE)

     SET(RENDER_WITH_PANGO_CAIRO TRUE)

@@ -147,4 +147,4 @@ ENDIF(HAVE_CAIRO_PDF)
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)

 FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n")

 INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}")  # 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
\ 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 5ca64d769..8c888726b 100644
--- 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 f61418efe..501f11375 100644
--- 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
 )