From 9d1e14030e8ebed89a16874c24c9753d6b6f22ee Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@laimg.moc>
Date: Fri, 24 May 2019 20:45:05 +0000
Subject: [PATCH] remove FIXME from mkspecs

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

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---
 cmake/KatieConfig.cmake |  2 ++
 mkspecs/mkspecs.cmake   | 13 ++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmake/KatieConfig.cmake b/cmake/KatieConfig.cmake
index 337a68126..ac1e23548 100644
--- a/cmake/KatieConfig.cmake
+++ b/cmake/KatieConfig.cmake
@@ -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)
diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
index f6e0be0f2..9200f58df 100644
--- a/mkspecs/mkspecs.cmake
+++ b/mkspecs/mkspecs.cmake
@@ -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()