Cmake: minor fixes

diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 651df5bbff44c480237d4f1190d14542a0266671..de9a9b5d0bb8e75f16692a49dbba76ebeb95cc30 100644 (file)
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -7,14 +7,14 @@ ELSEIF(WIN32)
     SET(PACKAGE_LOCALE_DIR "locale")\r
 ENDIF(WIN32)\r
 \r
-SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)\r
-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)\r
+#SET(CMAKE_SKIP_RPATH:BOOL OFF)\r
+\r
+# 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\r
 #INCLUDE_DIRECTORIES ("${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/)  \r
 #LINK_DIRECTORIES ("${LINK_DIRECTORIES}" "${CMAKE_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" src/)\r
-
+\r
 #INSTALL(TARGETS INKSCAPE\r
 #  RUNTIME DESTINATION bin\r
 #  LIBRARY DESTINATION lib\r
@@ -26,6 +26,6 @@ SET(CMAKE_SKIP_RPATH:BOOL OFF)
 \r
 #CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/INKSCAPE.pc.in\r
 #                ${CMAKE_BINARY_DIR}/INKSCAPE.pc @ONLY IMMEDIATE )\r
-#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)
-
+#INSTALL(FILES "${CMAKE_BINARY_DIR}/INKSCAPE.pc" DESTINATION lib/pkgconfig)\r
+\r
 #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")\r

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index d527355ed7bc057b3bfbdd46ecb5c6bf161969b9..d4971416e61278e3893711d1f97820cd396993a5 100644 (file)
--- 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)