summaryrefslogtreecommitdiffstats
path: root/CMakeScripts
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeScripts')
-rw-r--r--CMakeScripts/ConfigChecks.cmake10
-rw-r--r--CMakeScripts/DefineDependsandFlags.cmake28
2 files changed, 19 insertions, 19 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 749c3c534..d20868767 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -1,7 +1,7 @@
#---------------
# From here on:
# Set all HAVE_XXX variables, to correctly set all defines in config.h
-SET(CMAKE_REQUIRED_INCLUDES ${INK_INCLUDES})
+#SET(CMAKE_REQUIRED_INCLUDES ${INK_INCLUDES})
INCLUDE (CheckIncludeFiles)
INCLUDE (CheckFunctionExists)
INCLUDE (CheckStructMember)
@@ -55,9 +55,9 @@ 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(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?
# yes but needs to be done a better way
IF (HAVE_CAIRO_PDF)
SET(PANGO_ENABLE_ENGINE TRUE)
@@ -67,5 +67,5 @@ ENDIF(HAVE_CAIRO_PDF)
# Create the two configuration files: config.h and inkscape_version.h
# Create them in the binary root dir
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")
-add_definitions(-DHAVE_CONFIG_H)
+FILE(WRITE ${CMAKE_BINARY_DIR}/inkscape_version.h "#define INKSCAPE_VERSION \"${INKSCAPE_VERSION}\"\n")
+add_definitions(-DHAVE_CONFIG_H)
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d4971416e..89f33114d 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -19,20 +19,20 @@ INCLUDE(IncludeJava)
# end Dependencies
#Linking
-LIST(APPEND INKSCAPE_LIBS
-${GTK2_LIBRARIES}
-${SIGC++_LIBRARIES}
-${GSL_LIBRARIES}
-${XML2_LIBRARIES}
-${XSLT_LIBRARIES}
-${IMAGEMAGICK++_LIBRARIES}
-${FREETYPE2_LIBRARIES}
-${GNOMEVFS2_LIBRARIES}
-${BOOST_LIBRARIES}
-${BOEHMGC_LIBRARIES}
-${PNG_LIBRARIES}
-${POPT_LIBRARIES}
-${OPENSSL_LIBRARIES}
+LIST(APPEND INKSCAPE_LIBS
+# ${GTK2_LIBRARIES}
+# ${SIGC++_LIBRARIES}
+# ${GSL_LIBRARIES}
+# ${XML2_LIBRARIES}
+# ${XSLT_LIBRARIES}
+# ${IMAGEMAGICK++_LIBRARIES}
+# ${FREETYPE2_LIBRARIES}
+# ${GNOMEVFS2_LIBRARIES}
+# ${BOOST_LIBRARIES}
+# ${BOEHMGC_LIBRARIES}
+# ${PNG_LIBRARIES}
+# ${POPT_LIBRARIES}
+# ${OPENSSL_LIBRARIES}
)
#Includes