Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-23 10:22:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor build system cleanups

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2015-12-15 21:41:35 +02:00
parent 1ac7f59fc2
commit eb445a550a
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CMakeLists.txt
View file

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

3
mkspecs/win32/win32.cmake
View file

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

8
src/shared/bootstrap.cmake
View file

@ -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