merge mkspecs into top-level and macros build files

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 448861f..307f39b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,6 @@ include(CheckStructHasMember)
 include(CheckCXXSourceRuns)
 include(FeatureSummary)
 include(KatieBuildMacros)
-include(mkspecs/mkspecs.cmake)
 
 # disable some compiler warnings
 set(KATIE_NO_WARNINGS
@@ -80,6 +79,16 @@ foreach(nowarning ${KATIE_NO_WARNINGS})
     endif()
 endforeach()
 
+# https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
+# https://github.com/Kitware/CMake/blob/master/Modules/CMakeDetermineSystem.cmake
+if(CMAKE_SYSTEM_NAME MATCHES "(Linux|GNU)")
+    katie_definition(-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_GNU_SOURCE)
+elseif(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|DragonFly)")
+    katie_definition(-D_THREAD_SAFE)
+elseif(NOT CMAKE_SYSTEM_NAME MATCHES "(OpenBSD|NetBSD|Solaris|SunOS)")
+    message(FATAL_ERROR "Unknown platform '${CMAKE_SYSTEM_NAME}'")
+endif()
+
 # mostly relevant to the build process, also stored in the version file for CMake and in qconfig.h.cmake
 set(KATIE_MAJOR "4")
 set(KATIE_MINOR "10")
@@ -1003,12 +1012,6 @@ configure_file(
 )
 
 install(
-    DIRECTORY mkspecs
-    DESTINATION ${KATIE_CMAKE_PATH}
-    COMPONENT Devel
-)
-
-install(
     FILES
     ${CMAKE_BINARY_DIR}/KatieConfig.cmake
     ${CMAKE_BINARY_DIR}/KatieConfigVersion.cmake

diff --git a/cmake/KatieConfig.cmake b/cmake/KatieConfig.cmake
index 9fea6eb..d971b2e 100644 (file)
--- a/cmake/KatieConfig.cmake
+++ b/cmake/KatieConfig.cmake
@@ -12,7 +12,6 @@
 #  KATIE_<COMPONENT>_LIBRARIES   - component libraries to link against e.g. QtCore
 #  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:
@@ -51,7 +50,6 @@ if(NOT KATIE_FOUND)
     set(KATIE_COMPONENTS @KATIE_COMPONENTS@)
     set(KATIE_TOOLS @KATIE_TOOLS@)
     set(KATIE_TOOLS_SUFFIX "@KATIE_TOOLS_SUFFIX@")
-    set(KATIE_MKSPECS_DIR "${CMAKE_CURRENT_LIST_DIR}/mkspecs")
     set(KATIE_TYPE @KATIE_TYPE@)
 
     foreach(component ${KATIE_COMPONENTS})
@@ -73,9 +71,6 @@ if(NOT KATIE_FOUND)
         set(KATIE_${uppertool} Katie::${tool})
     endforeach()
 
-    # Platform specific stuff and some tests
-    include("${KATIE_MKSPECS_DIR}/mkspecs.cmake")
-
     if(NOT "${KATIE_FIND_QUIETLY}")
         message(STATUS "Found Katie version: ${KATIE_VERSION}")
     endif()
@@ -99,7 +94,7 @@ if(NOT KATIE_FOUND)
         set(QT4_INCLUDE_DIR ${KATIE_INCLUDES})
         set(QT_LIBRARIES ${KATIE_LIBRARIES})
         set(QT_USE_FILE "${CMAKE_CURRENT_LIST_DIR}/Qt4UseFile.cmake")
-        set(QT_MKSPECS_DIR "${KATIE_MKSPECS_DIR}")
+        set(QT_MKSPECS_DIR "${CMAKE_CURRENT_LIST_DIR}/mkspecs")
         set(QT_LIBRARY_DIR ${KATIE_LIBRARIES_PATH})
         set(QT_BINARY_DIR ${KATIE_BINARIES_PATH})
         set(QT_PLUGINS_DIR ${KATIE_PLUGINS_PATH})

diff --git a/cmake/modules/KatieBuildMacros.cmake b/cmake/modules/KatieBuildMacros.cmake
index c08a6ec..735cdf4 100644 (file)
--- a/cmake/modules/KatieBuildMacros.cmake
+++ b/cmake/modules/KatieBuildMacros.cmake
@@ -1,6 +1,14 @@
 # Copyright (C) 2015, Ivailo Monev, <xakepa10@gmail.com>
 # Redistribution and use is allowed according to the terms of the BSD license.
 
+# a function to append definitions to KATIE_DEFINITIONS which is stored in
+# KatieConfig.cmake and pkg-config files as interface definitions and add
+# definitions to the current directory scope
+function(KATIE_DEFINITION DEF)
+    set(KATIE_DEFINITIONS ${KATIE_DEFINITIONS} ${DEF} ${ARGN} PARENT_SCOPE)
+    add_definitions(${DEF} ${ARGN})
+endfunction()
+
 # a function to check for header presence, if header is found a definition is
 # added
 function(KATIE_CHECK_HEADER FORHEADER)

diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
deleted file mode 100644 (file)
index 5e9152e..0000000
--- a/mkspecs/mkspecs.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-macro(KATIE_DEFINITION DEF)
-    set(KATIE_DEFINITIONS ${KATIE_DEFINITIONS} ${DEF} ${ARGN})
-    add_definitions(${DEF} ${ARGN})
-endmacro()
-
-# https://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
-# https://github.com/Kitware/CMake/blob/master/Modules/CMakeDetermineSystem.cmake
-if(CMAKE_SYSTEM_NAME MATCHES "(Linux|GNU)")
-    katie_definition(-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -D_GNU_SOURCE)
-elseif(CMAKE_SYSTEM_NAME MATCHES "(FreeBSD|DragonFly)")
-    katie_definition(-D_THREAD_SAFE)
-elseif(NOT CMAKE_SYSTEM_NAME MATCHES "(OpenBSD|NetBSD|Solaris|SunOS)")
-    message(FATAL_ERROR "Unknown platform '${CMAKE_SYSTEM_NAME}'")
-endif()

diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist
index 5f492c8..705c031 100644 (file)
--- a/package/freebsd/pkg-plist
+++ b/package/freebsd/pkg-plist
@@ -1463,7 +1463,6 @@ lib/cmake/Katie/KatieConfigVersion.cmake
 lib/cmake/Katie/KatieTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Katie/KatieTargets.cmake
 lib/cmake/Katie/Qt4UseFile.cmake
-lib/cmake/Katie/mkspecs/mkspecs.cmake
 lib/katie/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
 lib/katie/imports/Qt/labs/folderlistmodel/qmldir
 lib/katie/imports/Qt/labs/gestures/libqmlgesturesplugin.so

diff --git a/package/netbsd/PLIST.common b/package/netbsd/PLIST.common
index 4dcb696..4961c9d 100644 (file)
--- a/package/netbsd/PLIST.common
+++ b/package/netbsd/PLIST.common
@@ -1466,7 +1466,6 @@ lib/cmake/Katie/KatieConfigVersion.cmake
 lib/cmake/Katie/KatieTargets-relwithdebinfo.cmake
 lib/cmake/Katie/KatieTargets.cmake
 lib/cmake/Katie/Qt4UseFile.cmake
-lib/cmake/Katie/mkspecs/mkspecs.cmake
 lib/katie/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
 lib/katie/imports/Qt/labs/folderlistmodel/qmldir
 lib/katie/imports/Qt/labs/gestures/libqmlgesturesplugin.so

diff --git a/package/openbsd/pkg/PLIST b/package/openbsd/pkg/PLIST
index 47613e0..e930b6a 100644 (file)
--- a/package/openbsd/pkg/PLIST
+++ b/package/openbsd/pkg/PLIST
@@ -1480,8 +1480,6 @@ lib/cmake/Katie/KatieConfigVersion.cmake
 lib/cmake/Katie/KatieTargets${MODCMAKE_BUILD_SUFFIX}
 lib/cmake/Katie/KatieTargets.cmake
 lib/cmake/Katie/Qt4UseFile.cmake
-lib/cmake/Katie/mkspecs/
-lib/cmake/Katie/mkspecs/mkspecs.cmake
 lib/katie/
 lib/katie/imports/
 lib/katie/imports/Qt/