Fixing build for Linux.

Replaced tabs with whitespaces.

(bzr r15002.1.7)

3 files changed, 314 insertions, 323 deletions

diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake
index 91404f874..ebd005cb3 100644
--- a/CMakeScripts/ConfigEnv.cmake
+++ b/CMakeScripts/ConfigEnv.cmake
@@ -2,53 +2,53 @@
 # Set platform defaults (originally copied from darktable)

 # -----------------------------------------------------------------------------

 if(WIN32)

-    message("-- Windows build detected, setting default features")

+  message("-- Windows build detected, setting default features")

 

-	include(mingwenv.cmake)

-		

-	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 Native Language Support (using gettext)" ON)

-	option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON)

-	

-	# Does not compile on Windows with these options.

-	option(BR_PTHREADS "Use binreloc thread support" OFF)

-	option(ENABLE_BINRELOC "Use AutoPackage" OFF)

+  include(mingwenv.cmake)

+  

+  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 Native Language Support (using gettext)" ON)

+  option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON)

+  

+  # Does not compile on Windows with these options.

+  option(BR_PTHREADS "Use binreloc thread support" OFF)

+  option(ENABLE_BINRELOC "Use AutoPackage" OFF)

 endif()

 

 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")

+  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()

+  # 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}")

+  # detect current GTK+ backend

+  pkg_check_variable(gtk+-2.0 target)

+  message("GTK2 backend: ${GTK+_2.0_TARGET}")

 endif()

 

 include(CMakeScripts/ConfigPaths.cmake)
\ No newline at end of file
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake
index 9774d4df2..9489ba047 100644
--- a/CMakeScripts/ConfigPaths.cmake
+++ b/CMakeScripts/ConfigPaths.cmake
@@ -1,28 +1,28 @@
 message(STATUS "Creating build files in: ${CMAKE_CURRENT_BINARY_DIR}")
 
 if(WIN32)
-	set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/inkscape")
-	
-	set(INKSCAPE_LIBDIR "\\\\lib")
-	set(INKSCAPE_DATADIR "")
-	
-	set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale")
-	
-	set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
-	
-	mark_as_advanced(SHARE_INSTALL)
+  set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/inkscape")
+  
+  set(INKSCAPE_LIBDIR "\\\\lib")
+  set(INKSCAPE_DATADIR "")
+  
+  set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale")
+  
+  set(SHARE_INSTALL "share" CACHE STRING "Data file install path. Must be a relative path (from CMAKE_INSTALL_PREFIX), with no trailing slash.")
+  
+  mark_as_advanced(SHARE_INSTALL)
 else()
-	set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
-	set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+  set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
+  set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
 
-	# 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)
+  # 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)
 
-	if(NOT SHARE_INSTALL)
-		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)
+  if(NOT SHARE_INSTALL)
+    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)
+  mark_as_advanced(SHARE_INSTALL)
 endif()
\ No newline at end of file
diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake
index 6a95ce604..8306cec16 100644
--- a/CMakeScripts/Install.cmake
+++ b/CMakeScripts/Install.cmake
@@ -1,271 +1,262 @@
-if(UNIX)

-	#Define the installation

-	install(

-	  TARGETS inkscape_base inkscape inkview 

-	  RUNTIME DESTINATION bin

-	  LIBRARY DESTINATION lib/inkscape

-	  ARCHIVE DESTINATION lib/inkscape

-	)

-	

+if(UNIX)  

     #The install directive for the binaries and libraries are found in src/CMakeList.txt

-    install(

-	FILES ${CMAKE_BINARY_DIR}/inkscape.desktop

-	DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications

-	)

+    install(FILES

+      ${CMAKE_BINARY_DIR}/inkscape.desktop

+      DESTINATION ${CMAKE_INSTALL_PREFIX}/${SHARE_INSTALL}/applications)

+endif()

 

+if(NOT WIN32)

     # this should probably be done no matter what the platform is, just set SHARE_INSTALL first

-    add_subdirectory(share)

-elseif(WIN32)

-	install(PROGRAMS

-		${EXECUTABLE_OUTPUT_PATH}/inkscape.exe

-		${EXECUTABLE_OUTPUT_PATH}/inkview.exe

-		DESTINATION ${CMAKE_INSTALL_PREFIX}

-	)

+    add_subdirectory(../share)

+else()

+  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

-		NEWS

-		README

-		TRANSLATORS

-		DESTINATION ${CMAKE_INSTALL_PREFIX})

-		

-	# There are differences in the devlibs for 64-Bit and 32-Bit build environments.

-	if(HAVE_MINGW64)

-		install(FILES

-			${DEVLIBS_BIN}/bz2-1.dll

-			${DEVLIBS_BIN}/icudt56.dll

-			${DEVLIBS_BIN}/icuin56.dll

-			${DEVLIBS_BIN}/icuuc56.dll

-			${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll

-			${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll

-			${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll

-			${DEVLIBS_BIN}/libaspell-15.dll

-			${DEVLIBS_BIN}/libatk-1.0-0.dll

-			${DEVLIBS_BIN}/libatkmm-1.6-1.dll

-			${DEVLIBS_BIN}/libcairo-2.dll

-			${DEVLIBS_BIN}/libcairomm-1.0-1.dll

-			${DEVLIBS_BIN}/libcdr-0.1.dll

-			${DEVLIBS_BIN}/libcurl-4.dll

-			${DEVLIBS_BIN}/libexif-12.dll

-			${DEVLIBS_BIN}/libexpat-1.dll

-			${DEVLIBS_BIN}/libexslt-0.dll

-			${DEVLIBS_BIN}/libffi-6.dll

-			${DEVLIBS_BIN}/libfontconfig-1.dll

-			${DEVLIBS_BIN}/libfreetype-6.dll

-			${DEVLIBS_BIN}/libgc-1.dll

-			${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll

-			${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll

-			${DEVLIBS_BIN}/libgdkmm-2.4-1.dll

-			${DEVLIBS_BIN}/libgio-2.0-0.dll

-			${DEVLIBS_BIN}/libgiomm-2.4-1.dll

-			${DEVLIBS_BIN}/libglib-2.0-0.dll

-			${DEVLIBS_BIN}/libglibmm-2.4-1.dll

-			${DEVLIBS_BIN}/libgmodule-2.0-0.dll

-			${DEVLIBS_BIN}/libgobject-2.0-0.dll

-			${DEVLIBS_BIN}/libgsl-19.dll

-			${DEVLIBS_BIN}/libgslcblas-0.dll

-			${DEVLIBS_BIN}/libgthread-2.0-0.dll

-			${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll

-			${DEVLIBS_BIN}/libgtkmm-2.4-1.dll

-			${DEVLIBS_BIN}/libharfbuzz-0.dll

-			${DEVLIBS_BIN}/libiconv-2.dll

-			${DEVLIBS_BIN}/libintl-8.dll

-			${DEVLIBS_BIN}/libjpeg-9.dll

-			${DEVLIBS_BIN}/liblcms2-2.dll

-			${DEVLIBS_BIN}/liblzma-5.dll

-			${DEVLIBS_BIN}/libpango-1.0-0.dll

-			${DEVLIBS_BIN}/libpangocairo-1.0-0.dll

-			${DEVLIBS_BIN}/libpangoft2-1.0-0.dll

-			${DEVLIBS_BIN}/libpangomm-1.4-1.dll

-			${DEVLIBS_BIN}/libpangowin32-1.0-0.dll

-			${DEVLIBS_BIN}/libpixman-1-0.dll

-			${DEVLIBS_BIN}/libpng16-16.dll

-			${DEVLIBS_BIN}/libpoppler-58.dll

-			${DEVLIBS_BIN}/libpoppler-glib-8.dll

-			${DEVLIBS_BIN}/libpopt-0.dll

-			${DEVLIBS_BIN}/libpotrace-0.dll

-			${DEVLIBS_BIN}/librevenge-0.0.dll

-			${DEVLIBS_BIN}/librevenge-stream-0.0.dll

-			${DEVLIBS_BIN}/libsigc-2.0-0.dll

-			${DEVLIBS_BIN}/libtiff-5.dll

-			${DEVLIBS_BIN}/libvisio-0.1.dll

-			${DEVLIBS_BIN}/libwpd-0.10.dll

-			${DEVLIBS_BIN}/libwpg-0.3.dll

-			${DEVLIBS_BIN}/libxml2-2.dll

-			${DEVLIBS_BIN}/libxslt-1.dll

-			${DEVLIBS_BIN}/zlib1.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})

-	else()

-		install(FILES

-			${DEVLIBS_BIN}/bzip2.dll

-			${DEVLIBS_BIN}/freetype6.dll

-			${DEVLIBS_BIN}/iconv.dll

-			${DEVLIBS_BIN}/icudata50.dll

-			${DEVLIBS_BIN}/icui18n50.dll

-			${DEVLIBS_BIN}/icuuc50.dll

-			${DEVLIBS_BIN}/intl.dll

-			${DEVLIBS_BIN}/libMagick++-3.dll

-			${DEVLIBS_BIN}/libMagickCore-3.dll

-			${DEVLIBS_BIN}/libMagickWand-3.dll

-			${DEVLIBS_BIN}/libatk-1.0-0.dll

-			${DEVLIBS_BIN}/libatkmm-1.6-1.dll

-			${DEVLIBS_BIN}/libcairo-2.dll

-			${DEVLIBS_BIN}/libcairomm-1.0-1.dll

-			${DEVLIBS_BIN}/libcdr-0.1.dll

-			${DEVLIBS_BIN}/libexif-12.dll

-			${DEVLIBS_BIN}/libexpat-1.dll

-			${DEVLIBS_BIN}/libexslt.dll

-			${DEVLIBS_BIN}/libfontconfig-1.dll

-			${DEVLIBS_BIN}/libgcc_s_sjlj-1.dll

-			${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll

-			${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll

-			${DEVLIBS_BIN}/libgdkmm-2.4-1.dll

-			${DEVLIBS_BIN}/libgio-2.0-0.dll

-			${DEVLIBS_BIN}/libgiomm-2.4-1.dll

-			${DEVLIBS_BIN}/libglib-2.0-0.dll

-			${DEVLIBS_BIN}/libglibmm-2.4-1.dll

-			${DEVLIBS_BIN}/libgmodule-2.0-0.dll

-			${DEVLIBS_BIN}/libgobject-2.0-0.dll

-			${DEVLIBS_BIN}/libgthread-2.0-0.dll

-			${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll

-			${DEVLIBS_BIN}/libgtkmm-2.4-1.dll

-			${DEVLIBS_BIN}/libintl-8.dll

-			${DEVLIBS_BIN}/libjpeg-7.dll

-			${DEVLIBS_BIN}/liblcms-1.dll

-			${DEVLIBS_BIN}/liblcms2-2.dll

-			${DEVLIBS_BIN}/libopenjpeg-2.dll

-			${DEVLIBS_BIN}/libpango-1.0-0.dll

-			${DEVLIBS_BIN}/libpangocairo-1.0-0.dll

-			${DEVLIBS_BIN}/libpangoft2-1.0-0.dll

-			${DEVLIBS_BIN}/libpangomm-1.4-1.dll

-			${DEVLIBS_BIN}/libpangowin32-1.0-0.dll

-			${DEVLIBS_BIN}/libpixman-1-0.dll

-			${DEVLIBS_BIN}/libpng12-0.dll

-			${DEVLIBS_BIN}/libpng14-14.dll

-			${DEVLIBS_BIN}/libpoppler-58.dll

-			${DEVLIBS_BIN}/libpoppler-glib-8.dll

-			${DEVLIBS_BIN}/libpopt-0.dll

-			${DEVLIBS_BIN}/librevenge-0.0.dll

-			${DEVLIBS_BIN}/librevenge-stream-0.0.dll

-			${DEVLIBS_BIN}/libsigc-2.0-0.dll

-			${DEVLIBS_BIN}/libtiff-3.dll

-			${DEVLIBS_BIN}/libvisio-0.1.dll

-			${DEVLIBS_BIN}/libwpd-0.9.dll

-			${DEVLIBS_BIN}/libwpd-stream-0.9.dll

-			${DEVLIBS_BIN}/libwpg-0.2.dll

-			${DEVLIBS_BIN}/libxml2.dll

-			${DEVLIBS_BIN}/libxslt.dll

-			${DEVLIBS_BIN}/msvcr70.dll

-			${DEVLIBS_BIN}/msvcr71.dll

-			${DEVLIBS_BIN}/pthreadGC2.dll

-			${DEVLIBS_BIN}/zlib1.dll

-			${MINGW_BIN}/mingwm10.dll

-			${MINGW_BIN}/libgomp-1.dll 

-			DESTINATION ${CMAKE_INSTALL_PREFIX})

-	endif()

+  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

+    NEWS

+    README

+    TRANSLATORS

+    DESTINATION ${CMAKE_INSTALL_PREFIX})

+    

+  # There are differences in the devlibs for 64-Bit and 32-Bit build environments.

+  if(HAVE_MINGW64)

+    install(FILES

+      ${DEVLIBS_BIN}/bz2-1.dll

+      ${DEVLIBS_BIN}/icudt56.dll

+      ${DEVLIBS_BIN}/icuin56.dll

+      ${DEVLIBS_BIN}/icuuc56.dll

+      ${DEVLIBS_BIN}/libMagick++-6.Q16-6.dll

+      ${DEVLIBS_BIN}/libMagickCore-6.Q16-2.dll

+      ${DEVLIBS_BIN}/libMagickWand-6.Q16-2.dll

+      ${DEVLIBS_BIN}/libaspell-15.dll

+      ${DEVLIBS_BIN}/libatk-1.0-0.dll

+      ${DEVLIBS_BIN}/libatkmm-1.6-1.dll

+      ${DEVLIBS_BIN}/libcairo-2.dll

+      ${DEVLIBS_BIN}/libcairomm-1.0-1.dll

+      ${DEVLIBS_BIN}/libcdr-0.1.dll

+      ${DEVLIBS_BIN}/libcurl-4.dll

+      ${DEVLIBS_BIN}/libexif-12.dll

+      ${DEVLIBS_BIN}/libexpat-1.dll

+      ${DEVLIBS_BIN}/libexslt-0.dll

+      ${DEVLIBS_BIN}/libffi-6.dll

+      ${DEVLIBS_BIN}/libfontconfig-1.dll

+      ${DEVLIBS_BIN}/libfreetype-6.dll

+      ${DEVLIBS_BIN}/libgc-1.dll

+      ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll

+      ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll

+      ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libgio-2.0-0.dll

+      ${DEVLIBS_BIN}/libgiomm-2.4-1.dll

+      ${DEVLIBS_BIN}/libglib-2.0-0.dll

+      ${DEVLIBS_BIN}/libglibmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libgmodule-2.0-0.dll

+      ${DEVLIBS_BIN}/libgobject-2.0-0.dll

+      ${DEVLIBS_BIN}/libgsl-19.dll

+      ${DEVLIBS_BIN}/libgslcblas-0.dll

+      ${DEVLIBS_BIN}/libgthread-2.0-0.dll

+      ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll

+      ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libharfbuzz-0.dll

+      ${DEVLIBS_BIN}/libiconv-2.dll

+      ${DEVLIBS_BIN}/libintl-8.dll

+      ${DEVLIBS_BIN}/libjpeg-9.dll

+      ${DEVLIBS_BIN}/liblcms2-2.dll

+      ${DEVLIBS_BIN}/liblzma-5.dll

+      ${DEVLIBS_BIN}/libpango-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangomm-1.4-1.dll

+      ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll

+      ${DEVLIBS_BIN}/libpixman-1-0.dll

+      ${DEVLIBS_BIN}/libpng16-16.dll

+      ${DEVLIBS_BIN}/libpoppler-58.dll

+      ${DEVLIBS_BIN}/libpoppler-glib-8.dll

+      ${DEVLIBS_BIN}/libpopt-0.dll

+      ${DEVLIBS_BIN}/libpotrace-0.dll

+      ${DEVLIBS_BIN}/librevenge-0.0.dll

+      ${DEVLIBS_BIN}/librevenge-stream-0.0.dll

+      ${DEVLIBS_BIN}/libsigc-2.0-0.dll

+      ${DEVLIBS_BIN}/libtiff-5.dll

+      ${DEVLIBS_BIN}/libvisio-0.1.dll

+      ${DEVLIBS_BIN}/libwpd-0.10.dll

+      ${DEVLIBS_BIN}/libwpg-0.3.dll

+      ${DEVLIBS_BIN}/libxml2-2.dll

+      ${DEVLIBS_BIN}/libxslt-1.dll

+      ${DEVLIBS_BIN}/zlib1.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})

+  else()

+    install(FILES

+      ${DEVLIBS_BIN}/bzip2.dll

+      ${DEVLIBS_BIN}/freetype6.dll

+      ${DEVLIBS_BIN}/iconv.dll

+      ${DEVLIBS_BIN}/icudata50.dll

+      ${DEVLIBS_BIN}/icui18n50.dll

+      ${DEVLIBS_BIN}/icuuc50.dll

+      ${DEVLIBS_BIN}/intl.dll

+      ${DEVLIBS_BIN}/libMagick++-3.dll

+      ${DEVLIBS_BIN}/libMagickCore-3.dll

+      ${DEVLIBS_BIN}/libMagickWand-3.dll

+      ${DEVLIBS_BIN}/libatk-1.0-0.dll

+      ${DEVLIBS_BIN}/libatkmm-1.6-1.dll

+      ${DEVLIBS_BIN}/libcairo-2.dll

+      ${DEVLIBS_BIN}/libcairomm-1.0-1.dll

+      ${DEVLIBS_BIN}/libcdr-0.1.dll

+      ${DEVLIBS_BIN}/libexif-12.dll

+      ${DEVLIBS_BIN}/libexpat-1.dll

+      ${DEVLIBS_BIN}/libexslt.dll

+      ${DEVLIBS_BIN}/libfontconfig-1.dll

+      ${DEVLIBS_BIN}/libgcc_s_sjlj-1.dll

+      ${DEVLIBS_BIN}/libgdk-win32-2.0-0.dll

+      ${DEVLIBS_BIN}/libgdk_pixbuf-2.0-0.dll

+      ${DEVLIBS_BIN}/libgdkmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libgio-2.0-0.dll

+      ${DEVLIBS_BIN}/libgiomm-2.4-1.dll

+      ${DEVLIBS_BIN}/libglib-2.0-0.dll

+      ${DEVLIBS_BIN}/libglibmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libgmodule-2.0-0.dll

+      ${DEVLIBS_BIN}/libgobject-2.0-0.dll

+      ${DEVLIBS_BIN}/libgthread-2.0-0.dll

+      ${DEVLIBS_BIN}/libgtk-win32-2.0-0.dll

+      ${DEVLIBS_BIN}/libgtkmm-2.4-1.dll

+      ${DEVLIBS_BIN}/libintl-8.dll

+      ${DEVLIBS_BIN}/libjpeg-7.dll

+      ${DEVLIBS_BIN}/liblcms-1.dll

+      ${DEVLIBS_BIN}/liblcms2-2.dll

+      ${DEVLIBS_BIN}/libopenjpeg-2.dll

+      ${DEVLIBS_BIN}/libpango-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangocairo-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangoft2-1.0-0.dll

+      ${DEVLIBS_BIN}/libpangomm-1.4-1.dll

+      ${DEVLIBS_BIN}/libpangowin32-1.0-0.dll

+      ${DEVLIBS_BIN}/libpixman-1-0.dll

+      ${DEVLIBS_BIN}/libpng12-0.dll

+      ${DEVLIBS_BIN}/libpng14-14.dll

+      ${DEVLIBS_BIN}/libpoppler-58.dll

+      ${DEVLIBS_BIN}/libpoppler-glib-8.dll

+      ${DEVLIBS_BIN}/libpopt-0.dll

+      ${DEVLIBS_BIN}/librevenge-0.0.dll

+      ${DEVLIBS_BIN}/librevenge-stream-0.0.dll

+      ${DEVLIBS_BIN}/libsigc-2.0-0.dll

+      ${DEVLIBS_BIN}/libtiff-3.dll

+      ${DEVLIBS_BIN}/libvisio-0.1.dll

+      ${DEVLIBS_BIN}/libwpd-0.9.dll

+      ${DEVLIBS_BIN}/libwpd-stream-0.9.dll

+      ${DEVLIBS_BIN}/libwpg-0.2.dll

+      ${DEVLIBS_BIN}/libxml2.dll

+      ${DEVLIBS_BIN}/libxslt.dll

+      ${DEVLIBS_BIN}/msvcr70.dll

+      ${DEVLIBS_BIN}/msvcr71.dll

+      ${DEVLIBS_BIN}/pthreadGC2.dll

+      ${DEVLIBS_BIN}/zlib1.dll

+      ${MINGW_BIN}/mingwm10.dll

+      ${MINGW_BIN}/libgomp-1.dll 

+      DESTINATION ${CMAKE_INSTALL_PREFIX})

+  endif()

 

-	# Setup application data directories, poppler files, locales, icons and themes

-	file(MAKE_DIRECTORY

-		data

-		doc

-		modules

-		plugins)

+  # 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/locale

-		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}/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

+    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/locale

+    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}/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 (HAVE_MINGW64)

-		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})

+  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 (HAVE_MINGW64)

+    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

-		DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

-		

-	if(HAVE_MINGW64)

-		install(FILES

-			${DEVLIBS_PATH}/python/python27.dll

-			DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

-	else()

-		install(FILES

-			${DEVLIBS_PATH}/python/python26.dll

-			DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

-	endif()

-		

-	install(DIRECTORY ${DEVLIBS_PATH}/python/lib

-		DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

-		

-	install(DIRECTORY ${DEVLIBS_PATH}/python/dlls

-		DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

-elseif(APPLE)

-    # TODO

+  # Python

+  install(FILES

+    ${DEVLIBS_PATH}/python/python.exe

+    ${DEVLIBS_PATH}/python/pythonw.exe

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

+    

+  if(HAVE_MINGW64)

+    install(FILES

+      ${DEVLIBS_PATH}/python/python27.dll

+      DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

+  else()

+    install(FILES

+      ${DEVLIBS_PATH}/python/python26.dll

+      DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

+  endif()

+    

+  install(DIRECTORY ${DEVLIBS_PATH}/python/lib

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

+    

+  install(DIRECTORY ${DEVLIBS_PATH}/python/dlls

+    DESTINATION ${CMAKE_INSTALL_PREFIX}/python)

 endif()
\ No newline at end of file