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

remove FIXME from mkspecs

Browse source 
the default covers most cases and KATIE_TYPE is now saved in the CMake config

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-05-24 20:45:05 +00:00
parent 366ffd11e2
commit 9d1e14030e
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/KatieConfig.cmake
View file

@ -12,6 +12,7 @@
# KATIE_<TOOL> - path to tool e.g. moc
# KATIE_<DATA>_PATH - path to different data type files e.g. translations
# KATIE_MKSPECS_DIR - directory to mkspecs
# KATIE_TYPE - build type, either SHARED or STATIC
#
# As well as some that are unilkely to be needed outside the project:
#
@ -58,6 +59,7 @@ if(NOT KATIE_FOUND)
set(KATIE_COMPONENTS @KATIE_COMPONENTS@)
set(KATIE_TOOLS @KATIE_TOOLS@)
set(KATIE_MKSPECS_DIR "${KATIE_CMAKE_DIR}/mkspecs")
set(KATIE_TYPE @KATIE_TYPE@)
foreach(component ${KATIE_COMPONENTS})
string(TOUPPER ${component} uppercomp)

13
mkspecs/mkspecs.cmake
View file

@ -1,8 +1,13 @@
# KatieConfig overrides that
# KatieConfig overrides those
if(NOT KATIE_MKSPECS_DIR)
set(KATIE_MKSPECS_DIR ${CMAKE_SOURCE_DIR}/mkspecs)
endif()
if(NOT KATIE_TYPE)
set(KATIE_TYPE SHARED)
katie_definition(-DQT_SHARED)
endif()
# TODO: more platforms/architectures support
include_directories(${KATIE_MKSPECS_DIR})
if(NOT KATIE_PLATFORM)
@ -54,12 +59,6 @@ if(NOT KATIE_ARCHITECTURE)
endif()
endif()
# FIXME: Plan9/NaCL does not supporting dynamic libraries
if(NOT KATIE_TYPE)
set(KATIE_TYPE SHARED)
katie_definition(-DQT_SHARED)
endif()
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
katie_definition(-DQT_NO_DEBUG -DNDEBUG)
endif()