mirror of
https://bitbucket.org/smil3y/katie.git
synced 2025-02-24 02:42:55 +00:00
remove KatieMacros CMake file
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev
parent
a57d5b3982
commit
92594eb8fb
5 changed files with 5 additions and 92 deletions
|
|
@ -48,7 +48,6 @@ endif()
|
|||
include(CheckIncludeFileCXX)
|
||||
include(CheckTypeSize)
|
||||
include(FeatureSummary)
|
||||
include(KatieMacros)
|
||||
include(KatieBuildMacros)
|
||||
include(mkspecs/mkspecs.cmake)
|
||||
|
||||
|
|
@ -1016,7 +1015,6 @@ install(
|
|||
${CMAKE_BINARY_DIR}/KatieConfig.cmake
|
||||
${CMAKE_BINARY_DIR}/KatieConfigVersion.cmake
|
||||
${CMAKE_SOURCE_DIR}/cmake/Qt4UseFile.cmake
|
||||
${CMAKE_SOURCE_DIR}/cmake/modules/KatieMacros.cmake
|
||||
DESTINATION ${KATIE_CMAKE_PATH}
|
||||
COMPONENT Devel
|
||||
)
|
||||
|
|
|
|||
|
|
@ -74,9 +74,6 @@ if(NOT KATIE_FOUND)
|
|||
set(KATIE_${uppertool} Katie::${tool})
|
||||
endforeach()
|
||||
|
||||
# Include macros, tools variables must be set before that
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/KatieMacros.cmake")
|
||||
|
||||
# Platform specific stuff and some tests
|
||||
include("${KATIE_MKSPECS_DIR}/mkspecs.cmake")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,86 +0,0 @@
|
|||
# Copyright (c) 2015-2020, Ivailo Monev, <xakepa10@gmail.com>
|
||||
# Redistribution and use is allowed according to the terms of the BSD license.
|
||||
|
||||
macro(KATIE_RESOURCES RESOURCES)
|
||||
foreach(tmpres ${RESOURCES} ${ARGN})
|
||||
get_filename_component(resource "${tmpres}" ABSOLUTE)
|
||||
get_source_file_property(skip "${resource}" SKIP_RESOURCE)
|
||||
if(NOT skip)
|
||||
get_filename_component(rscext "${resource}" EXT)
|
||||
get_filename_component(rscname "${resource}" NAME_WE)
|
||||
get_filename_component(rscpath "${resource}" PATH)
|
||||
string(REPLACE "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" rscpath "${rscpath}")
|
||||
if("${rscext}" STREQUAL ".ui")
|
||||
set(rscout "${rscpath}/ui_${rscname}.h")
|
||||
make_directory("${rscpath}")
|
||||
include_directories("${rscpath}")
|
||||
add_custom_command(
|
||||
COMMAND "${KATIE_UIC}" "${resource}" -o "${rscout}"
|
||||
OUTPUT "${rscout}"
|
||||
MAIN_DEPENDENCY "${resource}"
|
||||
)
|
||||
elseif("${rscext}" STREQUAL ".qrc")
|
||||
set(rscout "${rscpath}/qrc_${rscname}.cpp")
|
||||
make_directory("${rscpath}")
|
||||
include_directories("${rscpath}")
|
||||
add_custom_command(
|
||||
COMMAND "${KATIE_RCC}" "${resource}" -o "${rscout}" -name "${rscname}"
|
||||
OUTPUT "${rscout}"
|
||||
MAIN_DEPENDENCY ${resource}
|
||||
)
|
||||
set_property(SOURCE "${resource}" APPEND PROPERTY OBJECT_DEPENDS "${rscout}")
|
||||
elseif("${rscext}" MATCHES "(.h|.hpp|.cc|.cpp)")
|
||||
file(READ "${resource}" rsccontent)
|
||||
# this can be simpler if continue() was supported by old CMake versions
|
||||
if("${rsccontent}" MATCHES "(Q_OBJECT|Q_OBJECT_FAKE|Q_GADGET)")
|
||||
set(rscout "${rscpath}/moc_${rscname}${rscext}")
|
||||
get_directory_property(dirdefs COMPILE_DEFINITIONS)
|
||||
get_directory_property(dirincs INCLUDE_DIRECTORIES)
|
||||
set(mocargs)
|
||||
# COMPILE_DEFINITIONS does not include undefine definitions
|
||||
foreach(ddef ${dirdefs})
|
||||
set(mocargs ${mocargs} -D${ddef})
|
||||
endforeach()
|
||||
foreach(incdir ${dirincs})
|
||||
set(mocargs ${mocargs} -I${incdir})
|
||||
endforeach()
|
||||
make_directory("${rscpath}")
|
||||
include_directories("${rscpath}")
|
||||
add_custom_command(
|
||||
COMMAND "${KATIE_MOC}" -nw "${resource}" -o "${rscout}" ${mocargs}
|
||||
OUTPUT "${rscout}"
|
||||
)
|
||||
set_property(SOURCE "${resource}" APPEND PROPERTY OBJECT_DEPENDS "${rscout}")
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
endforeach()
|
||||
endmacro()
|
||||
|
||||
macro(KATIE_DBUS_ADAPTOR SRCDEP SRCIN OUTNAME)
|
||||
get_filename_component(resource "${SRCIN}" ABSOLUTE)
|
||||
set(rscout "${CMAKE_CURRENT_BINARY_DIR}/${OUTNAME}.h")
|
||||
set(mocout "${CMAKE_CURRENT_BINARY_DIR}/${OUTNAME}.moc")
|
||||
add_custom_command(
|
||||
COMMAND "${KATIE_QDBUSXML2CPP}" -m "${resource}" -a "${rscout}" -p "${OUTNAME}" ${ARGN}
|
||||
COMMAND "${KATIE_MOC}" -nw "${rscout}" -o "${mocout}" -i
|
||||
OUTPUT "${rscout}"
|
||||
)
|
||||
set_property(SOURCE ${SRCDEP} APPEND PROPERTY OBJECT_DEPENDS ${rscout})
|
||||
endmacro()
|
||||
|
||||
macro(KATIE_DBUS_INTERFACE SRCIN)
|
||||
string(REGEX MATCH ".*\\.(.*)\\.xml" ${SRCIN} OUTNAME)
|
||||
string(TOLOWER "${SRCIN}" SRCIN)
|
||||
set(rscout "${CMAKE_CURRENT_BINARY_DIR}/${OUTNAME}interface.h")
|
||||
add_custom_command(
|
||||
COMMAND "${KATIE_QDBUSXML2CPP}" -m "${SRCIN}" -a "${rscout}" -p "${OUTNAME}interface" ${ARGN}
|
||||
OUTPUT "${rscout}"
|
||||
)
|
||||
set_property(SOURCE "${SRCIN}" APPEND PROPERTY OBJECT_DEPENDS "${rscout}")
|
||||
endmacro()
|
||||
|
||||
macro(KATIE_DEFINITION DEF)
|
||||
set(KATIE_DEFINITIONS ${KATIE_DEFINITIONS} ${DEF} ${ARGN})
|
||||
add_definitions(${DEF} ${ARGN})
|
||||
endmacro()
|
||||
|
|
@ -1,3 +1,8 @@
|
|||
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(NOT KATIE_PLATFORM)
|
||||
|
|
|
|||
|
|
@ -1468,7 +1468,6 @@ lib/cmake/Katie/KatieConfig.cmake
|
|||
lib/cmake/Katie/KatieConfigVersion.cmake
|
||||
lib/cmake/Katie/KatieLibraryTargets-%%CMAKE_BUILD_TYPE%%.cmake
|
||||
lib/cmake/Katie/KatieLibraryTargets.cmake
|
||||
lib/cmake/Katie/KatieMacros.cmake
|
||||
lib/cmake/Katie/Qt4UseFile.cmake
|
||||
lib/cmake/Katie/mkspecs/bsymbolic_functions.cpp
|
||||
lib/cmake/Katie/mkspecs/mkspecs.cmake
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue