Update to trunk

(bzr r13645.1.170)

1 files changed, 12 insertions, 17 deletions

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index ad2d51724..29ccb3a91 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -23,21 +23,16 @@ list(APPEND INKSCAPE_CXX_FLAGS "-std=c++11")
 if(WIN32)
 	# Set the link and include directories
 	get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
-	
-	# MinGW supplied STL does not define these floating point constants.. :/
-	add_definitions(-DFLT_EPSILON=1e-9)
-	add_definitions(-DFLT_MAX=1e+37)
-	add_definitions(-DFLT_MIN=1e-37)
 
 	list(APPEND INKSCAPE_LIBS "-lmscms")
 
 	list(APPEND INKSCAPE_CXX_FLAGS "-mwindows")
 	list(APPEND INKSCAPE_CXX_FLAGS "-mthreads")
+
+	list(APPEND INKSCAPE_LIBS "-lgomp")
+	list(APPEND INKSCAPE_LIBS "-lwinpthread")
 	
 	if(HAVE_MINGW64)
-		list(APPEND INKSCAPE_LIBS "-lgomp")
-		list(APPEND INKSCAPE_LIBS "-lwinpthread")
-	
 		list(APPEND INKSCAPE_CXX_FLAGS "-m64")
 	else()
 		list(APPEND INKSCAPE_CXX_FLAGS "-m32")
@@ -85,19 +80,21 @@ if(WITH_GNOME_VFS)
 endif()
 
 if(ENABLE_LCMS)
+    unset(HAVE_LIBLCMS1)
+    unset(HAVE_LIBLCMS2)
     find_package(LCMS2)
     if(LCMS2_FOUND)
 	list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS})
 	list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES})
 	add_definitions(${LCMS2_DEFINITIONS})
-        set (HAVE_LIBLCMS2 1)
+        set (HAVE_LIBLCMS2 ON)
     else()
         find_package(LCMS)
         if(LCMS_FOUND)
             list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS})
             list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES})
             add_definitions(${LCMS_DEFINITIONS})
-            set (HAVE_LIBLCMS1 1)
+            set (HAVE_LIBLCMS1 ON)
         else()
             set(ENABLE_LCMS OFF)
         endif()
@@ -247,7 +244,7 @@ endif()
 # CMake's builtin
 # ----------------------------------------------------------------------------
 
-set(TRY_GTKSPELL 1)
+set(TRY_GTKSPELL ON)
 # Include dependencies:
 # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added
     pkg_check_modules(
@@ -270,14 +267,15 @@ set(TRY_GTKSPELL 1)
 
     if("${GTKMM_3_10_FOUND}")
         message("Using Gtkmm 3.10 build")
-        set (WITH_GTKMM_3_10 1)
+        set (WITH_GTKMM_3_10 ON)
     endif()
 
     pkg_check_modules(GDL_3_6 gdl-3.0>=3.6)
 
     if("${GDL_3_6_FOUND}")
         message("Using GDL 3.6 or higher")
-        set (WITH_GDL_3_6 1)
+        add_definitions(-DWITH_GDL_3_6)
+        set (WITH_GDL_3_6 ON)
     endif()
 
     set(TRY_GTKSPELL )
@@ -285,7 +283,7 @@ set(TRY_GTKSPELL 1)
 
     if("${GTKSPELL3_FOUND}")
         message("Using GtkSpell 3")
-        set (WITH_GTKSPELL 1)
+        set (WITH_GTKSPELL ON)
     else()
         unset(WITH_GTKSPELL)
     endif()
@@ -379,9 +377,6 @@ if(WITH_NLS)
     endif(GETTEXT_FOUND)
 endif(WITH_NLS)
 
-#sets c++11 for newer sigc++ if required when pkg-config does not detect it
-find_package(SigC++ REQUIRED)
-
 pkg_check_modules(SIGC++ REQUIRED sigc++-2.0 )
 list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})