4 files changed, 12 insertions, 35 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake
index 7ec6863eb..46df8051d 100644
--- a/CMakeScripts/ConfigChecks.cmake
+++ b/CMakeScripts/ConfigChecks.cmake
@@ -59,7 +59,7 @@ 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?
 # yes but needs to be done a better way
 if(HAVE_CAIRO_PDF)
     set(PANGO_ENABLE_ENGINE TRUE)
diff --git a/CMakeScripts/ConfigCompileFlags.cmake b/CMakeScripts/ConfigCompileFlags.cmake
index 0ff66fad8..3164dda60 100644
--- a/CMakeScripts/ConfigCompileFlags.cmake
+++ b/CMakeScripts/ConfigCompileFlags.cmake
@@ -2,7 +2,7 @@ set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
 add_definitions(-Wall -Wformat-security -W -Wpointer-arith -Wcast-align -Wsign-compare -Woverloaded-virtual -Wswitch)
 add_definitions(-O2)
 
-#define the flags for profiling if desired:
+# Define the flags for profiling if desired:
 if(WITH_PROFILING)
 	set(COMPILE_PROFILING_FLAGS "-pg")
 	set(LINK_PROFILING_FLAGS "-pg")
@@ -15,7 +15,7 @@ if(WIN32)
 	add_definitions(-DXP_WIN)
 endif(WIN32)
 
-# for Inkboard:
+# For Inkboard:
 add_definitions(-DHAVE_SSL "-DRELAYTOOL_SSL=\"static const int libssl_is_present=1; static int __attribute__((unused)) libssl_symbol_is_present(char *s){ return 1; }\"")
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMPILE_PROFILING_FLAGS} ")
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 848e293f4..1af591222 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -4,7 +4,7 @@ IF(WIN32)
     SET(PACKAGE_LOCALE_DIR "locale")
     set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
 ELSE(WIN32)
-    # TODO: check and change this to correct value:
+  # TODO: check and change this to correct value:
   if(NOT PACKAGE_LOCALE_DIR)
     SET(PACKAGE_LOCALE_DIR "${CMAKE_INSTALL_PREFIX}/share/locale") # packagers might overwrite this
   endif(NOT PACKAGE_LOCALE_DIR)
@@ -14,26 +14,3 @@ ELSE(WIN32)
   endif(NOT SHARE_INSTALL)
   mark_as_advanced(SHARE_INSTALL)
 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
-#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
-#  ARCHIVE DESTINATION lib
-#)
-
-#FILE(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
-#INSTALL(FILES ${files} DESTINATION include/INKSCAPE/INKSCAPE)
-
-#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)
-
-#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/UsePkgConfig.cmake b/CMakeScripts/UsePkgConfig.cmake
index 2de721238..f80e01ba8 100644
--- a/CMakeScripts/UsePkgConfig.cmake
+++ b/CMakeScripts/UsePkgConfig.cmake
@@ -33,7 +33,7 @@ MACRO(PKGCONFIG_FOUND _package _found)
   # reset the variable at the beginning
   SET(${_found})
 
-# if pkg-config has been found
+  # if pkg-config has been found
   IF(PKGCONFIG_EXECUTABLE)
 
     EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS ${_package} --print-errors --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
@@ -50,7 +50,7 @@ MACRO(PKGCONFIG_FOUND _package _found)
 ENDMACRO(PKGCONFIG_FOUND _found)
 
 MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
-# reset the variables at the beginning
+  # reset the variables at the beginning
   SET(${_include_DIR})
   SET(${_link_DIR})
   SET(${_link_FLAGS})
@@ -81,14 +81,14 @@ MACRO(PKGCONFIG _package _include_DIR _link_DIR _link_FLAGS _cflags)
 ENDMACRO(PKGCONFIG _include_DIR _link_DIR _link_FLAGS _cflags)
 
 MACRO(PKGCONFIG_VERSION _package _version)
-# reset the variables at the beginning
+  # reset the variables at the beginning
   SET(${_version})
 
-# if pkg-config has been found
+  # if pkg-config has been found
   IF(PKGCONFIG_EXECUTABLE)
     EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
 
-# and if the package of interest also exists for pkg-config, then get the information
+    # and if the package of interest also exists for pkg-config, then get the information
     IF(NOT _return_VALUE)
       EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --modversion OUTPUT_VARIABLE ${_version} )
     ENDIF(NOT _return_VALUE)
@@ -100,14 +100,14 @@ ENDMACRO(PKGCONFIG_VERSION _package _version)
 MARK_AS_ADVANCED(PKGCONFIG_EXECUTABLE)
 
 MACRO(PKGCONFIG_DEFINITION _package _definition)
-# reset the variables at the beginning
+  # reset the variables at the beginning
   SET(${_definition})
 
-# if pkg-config has been found
+  # if pkg-config has been found
   IF(PKGCONFIG_EXECUTABLE)
     EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --exists RETURN_VALUE _return_VALUE OUTPUT_VARIABLE _pkgconfigDevNull )
 
-# and if the package of interest also exists for pkg-config, then get the information
+    # and if the package of interest also exists for pkg-config, then get the information
     IF(NOT _return_VALUE)
       EXEC_PROGRAM(${PKGCONFIG_EXECUTABLE} ARGS --print-errors ${_package} --cflags-only-other OUTPUT_VARIABLE ${_definition} )
     ENDIF(NOT _return_VALUE)