Merge lp:~faubulous/inkscape/cmake-win32 into lp:~inkscape.dev/inkscape/trunk

[jazzynico]

Just to get a diff with lp:inkscape to ease testing.

[jazzynico (jazzynico)]

Just tried it on Windows 7 with the win32 build env (32-bit devlibs and TDM-GCC-4.6). Some comments (note that I'm a cmake newbie):
1. CMake doesn't use GS_BIN when already set (in my mingwenv.bat). It instead tries to add /bin to GS_PATH. Note that some files (pdf2ps.bat) in GS_PATH/lib need to be in GS_BIN too so that related extensions work as expected.
2. Why did you define DEVLIBS_PATH and MINGW_PATH in configure.bat? They are already defined in mingwenv.bat (with some additional paths).
3. I used -G "MSYS Makefiles" to run cmake from the MSYS shell. Cmake worked fine, but then 'make' failed when linking to the libinkscape_base shared library.
4. Then I tried -G "MinGW Makefiles" from a Windows console. Same linking problem.

That said, it's a very interesting improvement (I never managed to use cmake with the win32 build env. before!). Thanks!

[jazzynico (jazzynico)]

> 'make' failed when linking to the libinkscape_base shared library.

Correction. Not when linking to, but when linking the libinkscape_base.dll lib, with the following errors:
----
d:/dev/tdm-gcc-32-4.6/bin/../lib/gcc/mingw32/4.6.1/../../../../mingw32/bin/ld.exe: cannot find -lpangocairo-1.0
... same line with different libs here ...
d:/dev/tdm-gcc-32-4.6/bin/../lib/gcc/mingw32/4.6.1/../../../../mingw32/bin/ld.exe: cannot find -lsigc-2.0
collect2: ld returned 1 exit status
mingw32-make[2]: *** [lib/libinkscape_base.dll] Error 1
mingw32-make[1]: *** [src/CMakeFiles/inkscape_base.dir/all] Error 2
mingw32-make: *** [all] Error 2
----

[Jon A. Cruz (jon-joncruz)]

I'll have to finish reconciling with my local work, but the cmake files themselves do need some adjustment.

There are several lines that have been duplicated into if/else Windows blocks when adjusting to use the proper variables would allow a single line to be shared for all platforms.

review: Needs Fixing

[lp:~faubulous/inkscape/cmake-win32]

14868. By Sebastian Faubel on 2016-04-28

Detecting changes in the build environment in configure.bat

14869. By Sebastian Faubel on 2016-04-28

Configure script detects changes in the build environment and resets PATH accordingly.
Bugfix: Compile errors when trailing slash or backslash is missing from GS_PATH.

[Sebastian Faubel (faubulous)]

Dear Jon,

it seems that the 0.92 release is getting closer. Is there any progress
with CMake on Windows?

~Sebastian

*Semiodesk GmbH | *Werner-von-Siemens-Str. 6 Geb. 15k, 86159 Augsburg,
Germany | Phone: [phone] | Fax: [phone] | www.semiodesk.com

This e-mail message may contain confidential or legally privileged
information and is intended only for the use of the intended recipient(s).
Any unauthorized disclosure, dissemination, distribution, copying or the
taking of any action in reliance on the information herein is prohibited.
E-mails are not secure and cannot be guaranteed to be error free as they
can be intercepted, amended, or contain viruses. Anyone who communicates
with us by e-mail is deemed to have accepted these risks. Semiodesk GmbH is
not responsible for errors or omissions in this message and denies any
responsibility for any damage arising from the use of e-mail. Any opinion
and other statement contained in this message and any attachment are solely
those of the author and do not necessarily represent those of the company.

2016-04-28 15:37 GMT+02:00 Jon A. Cruz <email address hidden>:

> Review: Needs Fixing
>
> I'll have to finish reconciling with my local work, but the cmake files
> themselves do need some adjustment.
>
> There are several lines that have been duplicated into if/else Windows
> blocks when adjusting to use the proper variables would allow a single line
> to be shared for all platforms.
> --
> https://code.launchpad.net/~faubulous/inkscape/cmake-win32/+merge/293202
> You are the owner of lp:~faubulous/inkscape/cmake-win32.
>

[lp:~faubulous/inkscape/cmake-win32]

14870. By Sebastian Faubel on 2016-06-15

Inkscape can now be built using other shells and without invoking configure.bat
Moved Windows environment variables into ConfigPaths.cmake

14871. By Sebastian Faubel on 2016-06-27

Locales and app icon are now working.

14872. By Sebastian Faubel on 2016-06-27

Fixed generation of config.h

14873. By Sebastian Faubel on 2016-06-28

Removed BR options from CMakeLists.txt as they are optional.

[Patrick Storz (ede123)]

I think most of these changes have already been merged (not directly, though), notably revisions 14855, 15011 and 15024.

If there is anything in here that we still want please let us know!

=== modified file 'AUTHORS'
--- AUTHORS	2016-02-27 17:38:36 +0000
+++ AUTHORS	2016-06-28 06:54:18 +0000
@@ -172,3 +172,5 @@
 Daniel Yacob
 David Yip
 Masatake Yamato
+Moritz Eberl
+Sebastian Faubel
\ No newline at end of file

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-06-10 15:45:22 +0000
+++ CMakeLists.txt	2016-06-28 06:54:18 +0000
@@ -7,12 +7,59 @@
 message("Binary Dir: ${CMAKE_CURRENT_BINARY_DIR}")
 
 # -----------------------------------------------------------------------------
+# Set platform defaults (originally copied from darktable)
+# -----------------------------------------------------------------------------
+include(CMakeScripts/ConfigPaths.cmake)
+
+if(WIN32)
+    message("-- Windows build detected, setting default features")
+
+	list(INSERT CMAKE_SYSTEM_INCLUDE_PATH 0 ${DEVLIBS_PATH})
+	list(INSERT CMAKE_SYSTEM_LIBRARY_PATH 0 ${DEVLIBS_PATH})
+	
+	set(CMAKE_C_COMPILER "${MINGW_BIN}/gcc.exe")
+	set(CMAKE_C_LINK_EXECUTABLE "${MINGW_BIN}/gcc.exe")
+	set(CMAKE_CXX_COMPILER "${MINGW_BIN}/g++.exe")
+	set(CMAKE_CXX_LINK_EXECUTABLE "${MINGW_BIN}/g++.exe")
+	set(CMAKE_CXX_STANDARD 11)
+	
+	# Setup Windows resource files compiler.
+	set(CMAKE_RC_COMPILER "${MINGW_BIN}/windres.exe")
+	set(CMAKE_RC_COMPILER_INIT windres)
+	enable_language(RC)
+	set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -i <SOURCE> -o <OBJECT>")
+	
+	# These options are required for having i18n support on Windows.
+	option(ENABLE_NLS "Compile with i18n enabled" ON)
+	option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON)
+endif(WIN32)
+
+if(APPLE)
+    message("-- Mac OS X build detected, setting default features")
+    # prefer macports and/or user-installed libraries over system ones
+    #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local)
+    set(CMAKE_FIND_FRAMEWORK "LAST")
+
+    # test and display relevant env variables
+    if(DEFINED ENV{CMAKE_PREFIX_PATH})
+	message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}")
+    endif()
+    if(DEFINED ENV{GTKMM_BASEPATH})
+	message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}")
+    endif()
+
+    # detect current GTK+ backend
+    pkg_check_variable(gtk+-2.0 target)
+    message("GTK2 backend: ${GTK+_2.0_TARGET}")
+endif()
+
+# -----------------------------------------------------------------------------
 # CMake Configuration
 # -----------------------------------------------------------------------------
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeScripts/Modules")
 
 # avoid having empty buildtype
-set(CMAKE_BUILD_TYPE_INIT "Release")
+set(CMAKE_BUILD_TYPE_INIT "Debug")
 
 project(inkscape)
 
@@ -41,29 +88,6 @@
 include(CMakeScripts/HelperFunctions.cmake)
 
 # -----------------------------------------------------------------------------
-# Set platform defaults (originally copied from darktable)
-# -----------------------------------------------------------------------------
-if(APPLE)
-    message("-- Mac OS X build detected, setting default features")
-    # prefer macports and/or user-installed libraries over system ones
-    #LIST(APPEND CMAKE_PREFIX_PATH /opt/local /usr/local)
-    set(CMAKE_FIND_FRAMEWORK "LAST")
-
-    # test and display relevant env variables
-    if(DEFINED ENV{CMAKE_PREFIX_PATH})
-	message("CMAKE_PREFIX_PATH: $ENV{CMAKE_PREFIX_PATH}")
-    endif()
-    if(DEFINED ENV{GTKMM_BASEPATH})
-	message("GTKMM_BASEPATH: $ENV{GTKMM_BASEPATH}")
-    endif()
-
-    # detect current GTK+ backend
-    pkg_check_variable(gtk+-2.0 target)
-    message("GTK2 backend: ${GTK+_2.0_TARGET}")
-
-endif(APPLE)
-
-# -----------------------------------------------------------------------------
 # Redirect output files
 # -----------------------------------------------------------------------------
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" )
@@ -91,6 +115,7 @@
 option(WITH_NLS "Compile with Native Language Support (using gettext)" ON)
 option(WITH_GTK3_EXPERIMENTAL "Enable compilation with GTK+3 (EXPERIMENTAL!)" OFF)
 
+<<<<<<< TREE
 # -----------------------------------------------------------------------------
 # Test Harness
 # -----------------------------------------------------------------------------
@@ -105,10 +130,11 @@
 endif()
 
 include(CMakeScripts/ConfigPaths.cmake) # Installation Paths
+=======
+>>>>>>> MERGE-SOURCE
 include(CMakeScripts/DefineDependsandFlags.cmake) # Includes, Compiler Flags, and Link Libraries
 include(CMakeScripts/HelperMacros.cmake) # Misc Utility Macros
 
-
 # -----------------------------------------------------------------------------
 # BAD HACKS, NEED TO INVESTIGATE MAKING THESE LESS BAD
 add_definitions(-D_FORTIFY_SOURCE=2)
@@ -116,9 +142,11 @@
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-DHAVE_CAIRO_PDF=1)  # needed for src/libnrtype/Layout-TNG.h
 add_definitions(-DHAVE_TR1_UNORDERED_SET) # XXX make an option!
+
 if(NOT WIN32)
     add_definitions(-fPIC)
 endif()
+
 #
 # end badness
 # -----------------------------------------------------------------------------
@@ -156,27 +184,29 @@
 # -----------------------------------------------------------------------------
 # Man pages
 # -----------------------------------------------------------------------------
-include("CMakeScripts/Pod2man.cmake")
-
-# Load AUTHORS file contents into $INKSCAPE_AUTHORS
-file(READ ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS content)
-string(REGEX REPLACE "^([^\n#]+)\n" "\\1;\n" content_list "${content}")
-join(INKSCAPE_AUTHORS "," "${content_list}")
-
-foreach(podfile
-        man/inkscape.pod
-        man/inkscape.de.pod
-        man/inkscape.el.pod
-        man/inkscape.fr.pod
-        man/inkscape.ja.pod
-        man/inkscape.sk.pod
-        man/inkscape.zh_TW.pod
-	man/inkview.pod)
-    set(POD_IN ${CMAKE_CURRENT_SOURCE_DIR}/${podfile}.in)
-    set(POD_OUT ${CMAKE_CURRENT_BINARY_DIR}/${podfile})
-    configure_file(${POD_IN} ${POD_OUT})
-    pod2man(${POD_OUT} ${INKSCAPE_VERSION} 1 "Inkscape Commands Manual")
-endforeach()
+if(UNIX)
+	include("CMakeScripts/Pod2man.cmake")
+
+	# Load AUTHORS file contents into $INKSCAPE_AUTHORS
+	file(READ ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS content)
+	string(REGEX REPLACE "^([^\n#]+)\n" "\\1;\n" content_list "${content}")
+	join(INKSCAPE_AUTHORS "," "${content_list}")
+
+	foreach(podfile
+			man/inkscape.pod
+			man/inkscape.de.pod
+			man/inkscape.el.pod
+			man/inkscape.fr.pod
+			man/inkscape.ja.pod
+			man/inkscape.sk.pod
+			man/inkscape.zh_TW.pod
+		man/inkview.pod)
+		set(POD_IN ${CMAKE_CURRENT_SOURCE_DIR}/${podfile}.in)
+		set(POD_OUT ${CMAKE_CURRENT_BINARY_DIR}/${podfile})
+		configure_file(${POD_IN} ${POD_OUT})
+		pod2man(${POD_OUT} ${INKSCAPE_VERSION} 1 "Inkscape Commands Manual")
+	endforeach()
+endif()
 
 # -----------------------------------------------------------------------------
 # Installation
@@ -191,10 +221,185 @@
 
     # this should probably be done no matter what the platform is, just set SHARE_INSTALL first
     add_subdirectory(share) 
+elseif(WIN32)
+	SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/inkscape)
+	
+    install(PROGRAMS
+		${EXECUTABLE_OUTPUT_PATH}/inkscape.exe
+		${EXECUTABLE_OUTPUT_PATH}/inkview.exe
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
+	)
+	
+    install(FILES
+		${LIBRARY_OUTPUT_PATH}/libinkscape_base.dll
+		${LIBRARY_OUTPUT_PATH}/libgrid2.dll
+        DESTINATION ${CMAKE_INSTALL_PREFIX}
+	)
+		
+    # devlibs and mingw dlls
+    install(FILES
+		AUTHORS
+		COPYING
+		COPYING.LIB
+		NEWS
+		README
+		TRANSLATORS
+		${DEVLIBS_BIN}/libatkmm-1.6-1.dll
+		${DEVLIBS_BIN}/libglibmm-2.4-1.dll
+		${DEVLIBS_BIN}/libgiomm-2.4-1.dll
+		${DEVLIBS_BIN}/libgtkmm-2.4-1.dll
+		${DEVLIBS_BIN}/libgdkmm-2.4-1.dll
+		${DEVLIBS_BIN}/libpangomm-1.4-1.dll
+		${DEVLIBS_BIN}/libcairomm-1.0-1.dll
+		${DEVLIBS_BIN}/libsigc-2.0-0.dll
+		${DEVLIBS_BIN}/libfreetype-6.dll
+		${DEVLIBS_BIN}/libffi-6.dll
+		${DEVLIBS_BIN}/libgc-1.dll
+		${DEVLIBS_BIN}/libgsl-19.dll
+		${DEVLIBS_BIN}/libgslcblas-0.dll
+		${DEVLIBS_BIN}/libharfbuzz-0.dll
+		${DEVLIBS_BIN}/liblzma-5.dll
+		${DEVLIBS_BIN}/libaspell-15.dll
+		${DEVLIBS_BIN}/libatk-1.0-0.dll
+		${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll
+		${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll
+		${DEVLIBS_BIN}/libglib-2.0-0.dll
+		${DEVLIBS_BIN}/libgmodule-2.0-0.dll
+		${DEVLIBS_BIN}/libgobject-2.0-0.dll
+		${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll
+		${DEVLIBS_BIN}/libgthread-2.0-0.dll
+		${DEVLIBS_BIN}/libgio-2.0-0.dll
+		${DEVLIBS_BIN}/libcairo-2.dll
+		${DEVLIBS_BIN}/libpixman-1-0.dll
+		${DEVLIBS_BIN}/libpoppler-58.dll
+		${DEVLIBS_BIN}/libpoppler-glib-8.dll
+		${DEVLIBS_BIN}/libpangocairo-1.0-0.dll
+		${DEVLIBS_BIN}/libpango-1.0-0.dll
+		${DEVLIBS_BIN}/libpangoft2-1.0-0.dll
+		${DEVLIBS_BIN}/libpangowin32-1.0-0.dll
+		${DEVLIBS_BIN}/libfontconfig-1.dll
+		${DEVLIBS_BIN}/libxml2-2.dll
+		${DEVLIBS_BIN}/libxslt-1.dll
+		${DEVLIBS_BIN}/libexslt-0.dll
+		${DEVLIBS_BIN}/libexpat-1.dll
+		${DEVLIBS_BIN}/librevenge-0.0.dll
+		${DEVLIBS_BIN}/librevenge-stream-0.0.dll
+		${DEVLIBS_BIN}/libwpg-0.3.dll
+		${DEVLIBS_BIN}/libwpd-0.10.dll
+		${DEVLIBS_BIN}/libvisio-0.1.dll
+		${DEVLIBS_BIN}/libcdr-0.1.dll
+		${DEVLIBS_BIN}/icuin56.dll
+		${DEVLIBS_BIN}/icudt56.dll
+		${DEVLIBS_BIN}/icuuc56.dll
+		${DEVLIBS_BIN}/libjpeg-9.dll
+		${DEVLIBS_BIN}/libpng16-16.dll
+		${DEVLIBS_BIN}/libtiff-5.dll
+		${DEVLIBS_BIN}/libexif-12.dll
+		${DEVLIBS_BIN}/libcurl-4.dll
+		${DEVLIBS_BIN}/zlib1.dll
+		${DEVLIBS_BIN}/bz2-1.dll
+		${DEVLIBS_BIN}/libiconv-2.dll
+		${DEVLIBS_BIN}/libpopt-0.dll
+		${DEVLIBS_BIN}/liblcms2-2.dll
+		${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll
+		${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll
+		${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll
+		${DEVLIBS_BIN}/libintl-8.dll
+		${DEVLIBS_BIN}/libpotrace-0.dll
+		${MINGW_BIN}/libstdc++-6.dll
+        ${MINGW_BIN}/libwinpthread-1.dll
+        ${MINGW_BIN}/libgcc_s_seh-1.dll
+        ${MINGW_BIN}/libgomp-1.dll 
+        DESTINATION ${CMAKE_INSTALL_PREFIX})
+		
+	# Setup application data directories, poppler files, locales, icons and themes
+	file(MAKE_DIRECTORY
+		data
+		doc
+		modules
+		plugins)
+	
+	install(DIRECTORY
+		data
+		doc
+		modules
+		plugins
+		share
+		DESTINATION ${CMAKE_INSTALL_PREFIX}
+		PATTERN Adwaita EXCLUDE					# NOTE: The theme is not used on Windows.
+		PATTERN hicolor/index.theme EXCLUDE 	# NOTE: Empty index.theme in hicolor icon theme causes SIGSEGV.
+		PATTERN CMakeLists.txt EXCLUDE
+		PATTERN *.am EXCLUDE)
+		
+	install(DIRECTORY ${DEVLIBS_PATH}/share/themes
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share)
+		
+	install(DIRECTORY ${DEVLIBS_PATH}/share/poppler
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/share)
+		
+	install(DIRECTORY ${DEVLIBS_PATH}/etc/fonts
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/etc)
 
+	install(DIRECTORY ${DEVLIBS_PATH}/share/locale
+		DESTINATION ${CMAKE_INSTALL_PREFIX})
+		
+	install(DIRECTORY ${DEVLIBS_PATH}/etc/gtk-2.0
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/etc)
+		
+	# GTK 2.0
+	install(DIRECTORY ${DEVLIBS_LIB}/gtk-2.0
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+		FILES_MATCHING
+		PATTERN "*.dll"
+		PATTERN "*.cache")
+	
+	install(DIRECTORY ${DEVLIBS_LIB}/gdk-pixbuf-2.0
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+		FILES_MATCHING
+		PATTERN "*.dll"
+		PATTERN "*.cache")
+		
+	# Aspell dictionaries
+	install(DIRECTORY ${DEVLIBS_LIB}/aspell-0.60
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		
+	# Necessary to run extensions on windows if it is not in the path
+	if (CMAKE_SYSTEM_PROCESSOR MATCHES "AMD64")
+		install(FILES
+			${DEVLIBS_BIN}/gspawn-win64-helper.exe
+			${DEVLIBS_BIN}/gspawn-win64-helper-console.exe
+			DESTINATION ${CMAKE_INSTALL_PREFIX})
+	else()
+		install(FILES
+			${DEVLIBS_BIN}/gspawn-win32-helper.exe
+			${DEVLIBS_BIN}/gspawn-win32-helper-console.exe
+			DESTINATION ${CMAKE_INSTALL_PREFIX})
+	endif()
+		
+	# Perl
+	install(FILES
+		${DEVLIBS_PATH}/perl/bin/perl58.dll
+        DESTINATION ${CMAKE_INSTALL_PREFIX})
+	
+	# Python
+	install(FILES
+		${DEVLIBS_PATH}/python/python.exe
+		${DEVLIBS_PATH}/python/pythonw.exe
+		${DEVLIBS_PATH}/python/python27.dll
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/python)
+		
+	install(DIRECTORY ${DEVLIBS_PATH}/python/lib
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/python)
+		
+	install(DIRECTORY ${DEVLIBS_PATH}/python/dlls
+		DESTINATION ${CMAKE_INSTALL_PREFIX}/python)
 else()
+<<<<<<< TREE
     # TODO, WIN32, APPLE/OSX, MinGW
 
+=======
+	# TODO: Mac OS X
+>>>>>>> MERGE-SOURCE
 endif()
 
 # -----------------------------------------------------------------------------
@@ -245,6 +450,13 @@
 message("CMAKE_C_COMPILER:        ${CMAKE_C_COMPILER}")
 message("CMAKE_CXX_COMPILER:      ${CMAKE_CXX_COMPILER}")
 message("CMAKE_BUILD_TYPE:        ${CMAKE_BUILD_TYPE}")
+
+if(WIN32)
+message("CMAKE_PREFIX_PATH:           ${CMAKE_PREFIX_PATH}")
+message("CMAKE_FIND_LIBRARY_PREFIXES: ${CMAKE_FIND_LIBRARY_PREFIXES}")
+message("CMAKE_FIND_LIBRARY_SUFFIXES: ${CMAKE_FIND_LIBRARY_SUFFIXES}")
+endif()
+
 message("")
 
 # dependency info
@@ -263,4 +475,23 @@
 message("WITH_NLS:                ${WITH_NLS}")
 message("WITH_OPENMP:             ${WITH_OPENMP}")
 message("WITH_PROFILING:          ${WITH_PROFILING}")
+
+message("")
+
+if(WIN32)
+message("HAVE_MINGW:              ${HAVE_MINGW}")
+message("HAVE_MINGW64:            ${HAVE_MINGW64}")
+message("MINGW_PATH:              ${MINGW_PATH}")
+message("MINGW_ARCH:              ${MINGW_ARCH}")
+message("MINGW_ARCH_PATH:         ${MINGW_ARCH_PATH}")
+message("MINGW64_INCLUDE:         ${MINGW64_INCLUDE}")
+message("MINGW64_LIB:             ${MINGW64_LIB}")
+message("DEVLIBS_PATH:            ${DEVLIBS_PATH}")
+message("DEVLIBS_LIB:             ${DEVLIBS_LIB}")
+message("DEVLIBS_BIN:             ${DEVLIBS_BIN}")
+message("PKG_CONFIG_PATH:         ${PKG_CONFIG_PATH}")
+message("GS_PATH                  ${GS_PATH}")
+message("GS_BIN                   ${GS_BIN}")
+endif()
+
 message("------------------------------------------------------------------------")

=== modified file 'CMakeScripts/ConfigPaths.cmake'
--- CMakeScripts/ConfigPaths.cmake	2016-01-17 07:05:58 +0000
+++ CMakeScripts/ConfigPaths.cmake	2016-06-28 06:54:18 +0000
@@ -1,9 +1,153 @@
 message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")
 
 if(WIN32)
+	# Directory containing the precompiled Inkscape libraries. Usually c:\devlibs or c:\devlibs64
+	set(DEVLIBS_PATH C:/devlibs64)
+
+	# Directory containing the MinGW instance used for compilation. Usually c:\mingw or c:\mingw64
+	set(MINGW_PATH C:/mingw64)
+
+	# Directory containing the Ghostscript installation.
+	set(GS_PATH C:/latex/gs/gs8.61)
+		
+	# Normalize directory separator slashes.
+	string(REGEX REPLACE "\\\\" "/" DEVLIBS_PATH ${DEVLIBS_PATH})
+	string(REGEX REPLACE "\\\\" "/" MINGW_PATH ${MINGW_PATH})
+	string(REGEX REPLACE "\\\\" "/" GS_PATH ${GS_PATH})
+	
+	# =============== DEVLIBS CHECKS ===============
+	
+	# Directory containing the compile time .dll.a and .a files.
+	set(DEVLIBS_LIB "${DEVLIBS_PATH}/lib")
+	
+	if(NOT EXISTS "${DEVLIBS_LIB}")
+		message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_LIB}")
+	endif()
+	
+	# Add devlibs libraries to linker path.
+	link_directories(${DEVLIBS_LIB})
+	
+	set(DEVLIBS_INCLUDE ${DEVLIBS_PATH}/include)
+	
+	if(NOT EXISTS ${DEVLIBS_INCLUDE})
+		message(FATAL_ERROR "Inkscape development libraries directory does not exist: ${DEVLIBS_INCLUDE}")
+	endif()
+	
+	# Add general MinGW headers to compiler include path.
+	#include_directories(${DEVLIBS_INCLUDE})
+	
+	# Directory containing the precompiled .dll files.
+	set(DEVLIBS_BIN ${DEVLIBS_PATH}/bin)
+	
+	if(NOT EXISTS ${DEVLIBS_BIN})
+		message(FATAL_ERROR "Inkscape development binaries directory does not exist: ${DEVLIBS_BIN}")
+	endif()
+	
+	# Directory containing the pkgconfig .pc files.
+	set(PKG_CONFIG_PATH "${DEVLIBS_PATH}/lib/pkgconfig")
+	
+	if(NOT EXISTS "${PKG_CONFIG_PATH}")
+		message(FATAL_ERROR "pkgconfig directory does not exist: ${PKG_CONFIG_PATH}")
+	endif()
+	
+	# Add the devlibs directories to the paths used to find libraries and programs.
+	list(APPEND CMAKE_PREFIX_PATH ${DEVLIBS_PATH})
+	
+	# =============== MINGW CHECKS ===============
+	
+	# We are in a MinGW environment.
+	set(HAVE_MINGW ON)
+		
+	# Try to determine the MinGW processor architecture.
+	if(EXISTS ${MINGW_PATH}/mingw32)
+		set(HAVE_MINGW64 OFF)
+		set(MINGW_ARCH mingw32)
+	elseif(EXISTS ${MINGW_PATH}/x86_64-w64-mingw32)
+		set(HAVE_MINGW64 ON)
+		set(MINGW_ARCH x86_64-w64-mingw32)
+	else()
+		message(FATAL_ERROR "Unable to determine MinGW processor architecture. Are you using an unsupported MinGW version?")
+	endif()
+	
+	# Path to processor architecture specific binaries and libs.
+	set(MINGW_ARCH_PATH ${MINGW_PATH}/${MINGW_ARCH})
+	
+	set(MINGW_BIN ${MINGW_PATH}/bin)
+	
+	if(NOT EXISTS ${MINGW_BIN})
+		message(FATAL_ERROR "MinGW binary directory does not exist: ${MINGW_BIN}")
+	endif()
+	
+	set(MINGW_LIB ${MINGW_PATH}/lib)
+	
+	if(NOT EXISTS ${MINGW_LIB})
+		message(FATAL_ERROR "MinGW library directory does not exist: ${MINGW_LIB}")
+	endif()
+	
+	# Add MinGW libraries to linker path.
+	link_directories(${MINGW_LIB})
+	
+	set(MINGW_INCLUDE ${MINGW_PATH}/include)
+	
+	if(NOT EXISTS ${MINGW_INCLUDE})
+		message(FATAL_ERROR "MinGW include directory does not exist: ${MINGW_INCLUDE}")
+	endif()
+	
+	# Add general MinGW headers to compiler include path.
+	include_directories(${MINGW_INCLUDE})
+	
+	if(HAVE_MINGW64)
+		set(MINGW64_LIB ${MINGW_ARCH_PATH}/lib)
+		
+		if(NOT EXISTS ${MINGW64_LIB})
+			message(FATAL_ERROR "MinGW 64-Bit libraries directory does not exist: ${MINGW64_LIB}")
+		endif()
+	
+		# Add 64-Bit libraries to linker path.
+		link_directories(${MINGW64_LIB})
+		
+		set(MINGW64_INCLUDE ${MINGW_ARCH_PATH}/include)
+		
+		if(NOT EXISTS ${MINGW64_INCLUDE})
+			message(FATAL_ERROR "MinGW 64-Bit include directory does not exist: ${MINGW64_INCLUDE}")
+		endif()
+		
+		set(MINGW64_INCLUDE_SDL ${MINGW64_INCLUDE}/c++)
+		
+		if(NOT EXISTS ${MINGW64_INCLUDE_SDL})
+			message(FATAL_ERROR "MinGW 64-Bit SDL include directory does not exist: ${MINGW64_INCLUDE_SDL}")
+		endif()
+
+		# Add 64-Bit MinGW headers to compiler include path.
+		include_directories(${MINGW64_INCLUDE})
+		#include_directories(${MINGW64_INCLUDE_SDL})
+	endif()
+	
+	# =============== GHOSTSCRIPT CHECKS ===============
+	
+	# Check for Ghostscript.
+	set(GS_BIN "${GS_PATH}/bin")
+	
+	if(EXISTS "${GS_BIN}")
+		set(HAVE_GS_BIN ON)
+	else()
+		set(HAVE_GS_BIN OFF)
+	endif()
+
+	# =============== LIBRARY AND LINKER ===============
+	
+	# Tweak CMake into using Unix-style library names.
+	set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
+	set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll")
+	
+	if(NOT HAVE_MINGW64)
+		list(APPEND CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+	endif()
+	
+	# Directory containing the current locale (translations).
     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)
+elseif(UNIX)
     # 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
@@ -13,4 +157,4 @@
 	set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
     endif(NOT SHARE_INSTALL)
     mark_as_advanced(SHARE_INSTALL)
-endif(WIN32)
+endif()

=== modified file 'CMakeScripts/DefineDependsandFlags.cmake'
--- CMakeScripts/DefineDependsandFlags.cmake	2016-06-09 09:03:26 +0000
+++ CMakeScripts/DefineDependsandFlags.cmake	2016-06-28 06:54:18 +0000
@@ -15,72 +15,27 @@
 # Files we include
 # ----------------------------------------------------------------------------
 if(WIN32)
-message("---------------- BEGIN: Win32 ----------------")
-
- # The name of the target operating system
- set(CMAKE_SYSTEM_NAME Windows)
-
- message("CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME})
-
- set(CMAKE_C_COMPILER gcc)
- set(CMAKE_CXX_COMPILER g++)
- set(CMAKE_RC_COMPILER windres)
-
- # Adjust the command line parameters for windres to the verion of MinGW.
- set(CMAKE_RC_COMPILER_INIT windres)
- enable_language(RC)
- set(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> -O coff -i <SOURCE> -o <OBJECT>")
-
- # Here is the target environment located
- set(CMAKE_FIND_ROOT_PATH $ENV{MINGW_PATH}/)
-
- message("CMAKE_FIND_ROOT_PATH: " ${CMAKE_FIND_ROOT_PATH})
-
- # Tweak CMake into using Unix-style library names.
- set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
- set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll.a" ".dll")
-
- message("CMAKE_FIND_LIBRARY_PREFIXES: " ${CMAKE_FIND_LIBRARY_PREFIXES})
- message("CMAKE_FIND_LIBRARY_SUFFIXES: " ${CMAKE_FIND_LIBRARY_SUFFIXES})
-
- set(SDL_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}x86_64-w64-mingw32/include/c++)
-
- message("SDL_INCLUDE_DIR: " ${SDL_INCLUDE_DIR})
-
- #if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64")
- link_directories($ENV{MINGW_PATH}/lib)
- link_directories($ENV{DEVLIBS_PATH}/lib)
- link_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/lib)
- link_directories($ENV{WINDIR}/system32)
-
- include_directories($ENV{MINGW_PATH}/include)
-
- include_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/include)
- include_directories($ENV{MINGW_PATH}/x86_64-w64-mingw32/include/c++)
- #endif ()
-
- get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
-
- foreach(dir ${dirs})
-   message("CMAKE_INCLUDE_DIR:" ${dir})
- endforeach()
-
- add_definitions(-DFLT_EPSILON=1e-9)
- add_definitions(-DFLT_MAX=1e+37)
- add_definitions(-DFLT_MIN=1e-37)
-
- list(APPEND INKSCAPE_LIBS "-lgomp")
- list(APPEND INKSCAPE_LIBS "-lwinpthread")
- list(APPEND INKSCAPE_LIBS "-lmscms")
-
- list(APPEND INKSCAPE_CXX_FLAGS "-mwindows")
- list(APPEND INKSCAPE_CXX_FLAGS "-mthreads")
- list(APPEND INKSCAPE_CXX_FLAGS "-m64")
-
- # Try to compile using C++ 11.
- set(CMAKE_CXX_STANDARD 11)
-
- message("---------------- END: 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")
+	
+	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")
+	endif()
 endif()
 
 pkg_check_modules(INKSCAPE_DEP REQUIRED pangocairo pangoft2 fontconfig gthread-2.0 gsl gmodule-2.0)

=== added directory 'build'
=== added file 'build/configure.bat'
--- build/configure.bat	1970-01-01 00:00:00 +0000
+++ build/configure.bat	2016-06-28 06:54:18 +0000
@@ -0,0 +1,9 @@
+REM Delete the CMake cache. Needed when changes on the CMakeLists should be applied in a consistent way.
+del CMakeCache.txt
+rmdir /s /q CMakeFiles
+
+REM Reset the console colors just in case CMake screwed them up again.
+Color 07
+
+REM Configure using the MinGW compiler chain.
+cmake .. -G "MinGW Makefiles"
\ No newline at end of file

=== added file 'build/touch.bat'
--- build/touch.bat	1970-01-01 00:00:00 +0000
+++ build/touch.bat	2016-06-28 06:54:18 +0000
@@ -0,0 +1,4 @@
+REM NOTE: Use this command to significantly speed up compilation when changing the CMake config.
+
+REM Updating the modification date of object files so they do not need to be recompiled..
+forfiles /s /m *.obj /c "cmd /c copy /b @path +,,"
\ No newline at end of file

=== modified file 'config.h.cmake'
--- config.h.cmake	2016-06-05 07:13:26 +0000
+++ config.h.cmake	2016-06-28 06:54:18 +0000
@@ -232,10 +232,18 @@
 #cmakedefine HAVE_ZLIB_H 1
 
 /* Base data directory -- only path-prefix.h should use it! */
+#ifdef WIN32
+#define INKSCAPE_DATADIR ""
+#else
 #define INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share"
+#endif
 
 /* Base library directory -- only path-prefix.h should use it! */
+#ifdef WIN32
+#define INKSCAPE_LIBDIR "\\lib"
+#else
 #define INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib"
+#endif
 
 /* Define to 1 if `lstat' dereferences a symlink specified with a trailing
    slash. */

=== renamed file 'configure.bat' => 'configure.bat.THIS'
=== modified file 'mingwenv.bat'
--- mingwenv.bat	2014-07-28 20:11:22 +0000
+++ mingwenv.bat	2016-06-28 06:54:18 +0000
@@ -1,6 +1,6 @@
 @echo Setting environment variables for MinGw build of Inkscape
-IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs
-IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw
+IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs64
+IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw64
 set MINGW_BIN=%MINGW_PATH%\bin
 set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig
 set GS_BIN=C:\latex\gs\gs8.61\bin

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-06-12 08:25:42 +0000
+++ src/CMakeLists.txt	2016-06-28 06:54:18 +0000
@@ -2,10 +2,6 @@
 # Define the main source
 # -----------------------------------------------------------------------------
 
-set(main_SRC
-	main.cpp
-)
-
 set(sp_SRC
 	attribute-rel-css.cpp
 	attribute-rel-svg.cpp
@@ -423,21 +419,6 @@
 	version.h
 )
 
-if(WIN32)
-	list(APPEND inkscape_SRC
-		inkscape.rc
-		registrytool.cpp
-		#deptool.cpp
-		winconsole.cpp
-		winmain.cpp
-
-		# -------
-		# Headers
-		registrytool.h
-	)
-endif()
-
-
 # -----------------------------------------------------------------------------
 # Generate version file
 # -----------------------------------------------------------------------------
@@ -505,8 +486,26 @@
 # -----------------------------------------------------------------------------
 # Setup the executable
 # -----------------------------------------------------------------------------
-#add_inkscape_lib(sp_LIB "${sp_SRC}")
-#add_inkscape_lib(inkscape_LIB "${inkscape_SRC}")
+
+if(WIN32)
+	# Sources for the inkscape executable on Windows.
+	set(main_SRC
+		registrytool.h
+		registrytool.cpp
+		main.cpp
+		winmain.cpp
+		#winconsole.cpp
+	)
+	
+	# Add the platform specific resource files (enabling the app icon).
+	if(${HAVE_MINGW64})
+		list(APPEND main_SRC inkscape-x64.rc)
+	else()
+		list(APPEND main_SRC inkscape.rc)
+	endif()
+else()
+	set(main_SRC main.cpp)
+endif()
 
 # Build everything except main and inkview.c in a shared library.
 add_library(inkscape_base SHARED ${inkscape_SRC} ${sp_SRC})
@@ -515,6 +514,18 @@
 add_executable(inkscape ${main_SRC} )
 add_executable(inkview inkview.cpp )
 
+<<<<<<< TREE
+=======
+if(UNIX)
+# message after building.
+add_custom_command(
+    TARGET inkscape
+    POST_BUILD MAIN_DEPENDENCY inkscape
+    COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}'
+)
+endif()
+
+>>>>>>> MERGE-SOURCE
 add_dependencies(inkscape inkscape_version)
 
 if(WITH_DBUS)
@@ -525,11 +536,9 @@
         # order from automake
         #sp_LIB
         #nrtype_LIB
-
         #inkscape_LIB
         #sp_LIB # annoying, we need both!
         nrtype_LIB # annoying, we need both!
-
         croco_LIB
         avoid_LIB
         cola_LIB
@@ -548,15 +557,19 @@
     list (INSERT INKSCAPE_TARGET_LIBS 0 "gdl_LIB")
 endif()
 
-
-
-
+<<<<<<< TREE
+
+
+
+=======
+>>>>>>> MERGE-SOURCE
 # Link the inkscape_base library against all external dependencies
 target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS})
 
 # Link inkscape and inkview against inkscape_base
 target_link_libraries(inkscape inkscape_base )
 target_link_libraries(inkview inkscape_base)
+<<<<<<< TREE
 
 #Define the installation
 install(
@@ -567,3 +580,5 @@
   )
 
   
+=======
+>>>>>>> MERGE-SOURCE

=== removed file 'touch.bat'
--- touch.bat	2016-04-16 15:59:22 +0000
+++ touch.bat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-forfiles /s /m *.obj /c "cmd /c copy /b @path +,,"
\ No newline at end of file