minor build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index db07f95..26f642c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,12 +76,12 @@ add_feature_info(egl WITH_EGL "an open source something")
 option(WITH_OPENGL "Build opengl support" ON)
 add_feature_info(opengl WITH_OPENGL "an open source something")
 
-option(WITH_FONTCONFIG "Build fontconfig support" ON)
-add_feature_info(fontconfig WITH_FONTCONFIG "an open source something")
-
 option(WITH_FREETYPE "Build freetype2 support" ON)
 add_feature_info(freetype2 WITH_FREETYPE "an open source something")
 
+option(WITH_FONTCONFIG "Build fontconfig support" ON)
+add_feature_info(fontconfig WITH_FONTCONFIG "an open source something")
+
 option(WITH_ICU "Build icu support" ON)
 add_feature_info(icu WITH_ICU "an open source something")
 
@@ -286,6 +286,13 @@ set_package_properties(PulseAudio PROPERTIES
     TYPE OPTIONAL
 )
 
+find_package(Freetype)
+set_package_properties(Freetype PROPERTIES
+    PURPOSE "Required for fonts configuration support"
+    DESCRIPTION "Freely available software library to render fonts"
+    URL "http://www.freetype.org"
+    TYPE RECOMMENDED
+)
 
 find_package(Fontconfig)
 set_package_properties(Fontconfig PROPERTIES
@@ -295,14 +302,6 @@ set_package_properties(Fontconfig PROPERTIES
     TYPE RECOMMENDED
 )
 
-find_package(Freetype)
-set_package_properties(Freetype PROPERTIES
-    PURPOSE "Required for fonts configuration support"
-    DESCRIPTION "Freely available software library to render fonts"
-    URL "http://www.freetype.org"
-    TYPE RECOMMENDED
-)
-
 find_package(ICU)
 set_package_properties(ICU PROPERTIES
     PURPOSE "ICU locales support"

diff --git a/mkspecs/win32/win32.cmake b/mkspecs/win32/win32.cmake
index b9d8e05..6fe452f 100644 (file)
--- a/mkspecs/win32/win32.cmake
+++ b/mkspecs/win32/win32.cmake
@@ -17,3 +17,6 @@ set(QT_SETTINGS_PATH "${QT_DATA_PATH}/settings")
 
 set(WITH_FREETYPE OFF)
 set(WITH_FONTCONFIG OFF)
+# set(WITH_ICD ON)
+# TODO: enable directwrite on Vista+
+# set(WITH_DIRECTWRITE ON)

diff --git a/src/shared/bootstrap.cmake b/src/shared/bootstrap.cmake
index b19640c..ee1aa0f 100644 (file)
--- a/src/shared/bootstrap.cmake
+++ b/src/shared/bootstrap.cmake
@@ -96,9 +96,7 @@ if(UNIX)
         ${CMAKE_SOURCE_DIR}/src/core/io/qfsfileengine_unix.cpp
         ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_unix.cpp
     )
-endif()
-
-if(KATIE_PLATFORM STREQUAL "win32")
+elseif(KATIE_PLATFORM STREQUAL "win32")
     set(BOOTSTRAP_SOURCES
         ${BOOTSTRAP_SOURCES}
         ${CMAKE_SOURCE_DIR}/src/core/io/qfilesystemengine_win.cpp
@@ -107,9 +105,7 @@ if(KATIE_PLATFORM STREQUAL "win32")
         ${CMAKE_SOURCE_DIR}/src/core/plugin/qsystemlibrary.cpp
         ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_win.cpp
     )
-endif()
-
-if(KATIE_PLATFORM STREQUAL "mac")
+elseif(KATIE_PLATFORM STREQUAL "mac")
     set(BOOTSTRAP_SOURCES
         ${BOOTSTRAP_SOURCES}
         ${CMAKE_SOURCE_DIR}/src/core/tools/qlocale_mac.mm