From: verbalshadow <verbalshadow@users.sourceforge.net>
Date: Sat, 10 Jan 2009 01:00:09 +0000 (+0000)
Subject: Cmake: minor fixes
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1122d1286f0a5037e6bec713de1a101fcd31c858;p=inkscape.git

Cmake: minor fixes
---

diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 651df5bbf..de9a9b5d0 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -7,14 +7,14 @@ ELSEIF(WIN32)
     SET(PACKAGE_LOCALE_DIR "locale")
 ENDIF(WIN32)
 
-SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
-SET(CMAKE_SKIP_RPATH:BOOL OFF)
-
-# 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
+#SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
+#SET(CMAKE_SKIP_RPATH:BOOL OFF)
+
+# 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/)  
 #LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/)
-
+
 #INSTALL(TARGETS INKSCAPE
 #  RUNTIME DESTINATION bin
 #  LIBRARY DESTINATION lib
@@ -26,6 +26,6 @@ SET(CMAKE_SKIP_RPATH:BOOL OFF)
 
 #CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/INKSCAPE.pc.in
 #                ${CMAKE_BINARY_DIR}/INKSCAPE.pc @ONLY IMMEDIATE )
-#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)
-
+#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)
+
 #SET(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL  "Where to put the executables")set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL  "Where to put the libraries")
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d527355ed..d4971416e 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -57,5 +57,4 @@ ${OPENSSL_INCLUDE_DIRS}
 #C/C++ Flags
 INCLUDE_DIRECTORIES(${INK_INCLUDES})
 
-#INCLUDE(ConfigCompileFlags)
 INCLUDE(ConfigChecks)