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

installation paths revised

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-10-07 23:43:48 +00:00
parent fdb323085a
commit 8f1af925b4
74 changed files with 209 additions and 287 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
CMakeLists.txt
View file

@ -29,6 +29,32 @@ include(KatieBuildMacros)
set(KATIE_COMPONENTS "Core Gui Declarative Designer DesignerComponents Help Network Sql Svg Xml XmlPatterns Script ScriptTools Test UiTools")
set(KATIE_TOOLS "moc uic rcc qhelpgenerator qcollectiongenerator lupdate lrelease lconvert designer qscript qtconfig")
# for CPack
string(TIMESTAMP KATIE_DATE "%Y-%m-%d")
set(KATIE_BUGREPORT "xakepa10@gmail.com")
# for config.cpp.cmake
set(KATIE_LICENSE "Open Source")
set(KATIE_PRODUCT "AwesomeSauce") # it's not a bug, it's a feature!
include(GNUInstallDirs)
set(KATIE_PREFIX_FULL "${CMAKE_INSTALL_PREFIX}" CACHE PATH "General installation prefix")
set(KATIE_HEADERS_FULL "${CMAKE_INSTALL_FULL_INCLUDEDIR}/katie" CACHE PATH "Headers installation path")
set(KATIE_LIBRARIES_FULL "${CMAKE_INSTALL_FULL_LIBDIR}/katie" CACHE PATH "Libraries installation path")
set(KATIE_BINARIES_FULL "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Binaries installation path")
set(KATIE_PLUGINS_FULL "${KATIE_LIBRARIES_FULL}/plugins" CACHE PATH "Plugins installation path")
set(KATIE_IMPORTS_FULL "${KATIE_LIBRARIES_FULL}/imports" CACHE PATH "Declerative imports installation path")
set(KATIE_DATA_FULL "${CMAKE_INSTALL_FULL_DATADIR}" CACHE PATH "Generic data installation path")
set(KATIE_TRANSLATIONS_FULL "${KATIE_DATA_FULL}/translations" CACHE PATH "Translations instllation path")
set(KATIE_SETTINGS_FULL "${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg" CACHE PATH "Settings runtime path")
set(KATIE_CMAKE_FULL "${KATIE_DATA_FULL}/cmake/Katie" CACHE PATH "CMake aware modules path")
set(KATIE_LDCONF_FULL "${KATIE_DATA_FULL}/ld.so.conf.d" CACHE PATH "Run-time linker/loader configs path (UNIX)")
set(KATIE_PROFILE_FULL "${KATIE_DATA_FULL}/profile.d" CACHE PATH "Shell profile scripts path (UNIX)")
set(KATIE_MAN_FULL "${CMAKE_INSTALL_FULL_MANDIR}" CACHE PATH "Manual pages path (UNIX)")
set(KATIE_APPLICATIONS_FULL "${KATIE_DATA_FULL}/applications" CACHE PATH "Desktop applications register path (UNIX)")
set(KATIE_PIXMAPS_FULL "${KATIE_DATA_FULL}/pixmaps" CACHE PATH "Desktop applications icon path (UNIX)")
set(KATIE_PKGCONFIG_FULL "${KATIE_DATA_FULL}/pkgconfig" CACHE PATH "Desktop applications icon path (UNIX)")
katie_setup_paths()
# optional package
option(WITH_THREADS "Build threads support" ON)
add_feature_info(threads WITH_THREADS "an open source something")
@ -968,13 +994,12 @@ configure_file(
@ONLY
)
katie_setup_paths()
file(GLOB TRANSLATIONS "translations/*.ts")
katie_translations(${TRANSLATIONS})
install(
DIRECTORY mkspecs
DESTINATION ${CMAKE_INSTALL_PATH}
DESTINATION ${KATIE_CMAKE_RELATIVE}
COMPONENT Devel
)
@ -983,31 +1008,31 @@ install(
${CMAKE_BINARY_DIR}/KatieConfig.cmake
${CMAKE_BINARY_DIR}/KatieConfigVersion.cmake
${CMAKE_SOURCE_DIR}/cmake/modules/KatieMacros.cmake
DESTINATION ${CMAKE_INSTALL_PATH}
DESTINATION ${KATIE_CMAKE_RELATIVE}
COMPONENT Devel
)
install(
EXPORT KatieLibraryTargets
NAMESPACE Katie::
DESTINATION ${CMAKE_INSTALL_PATH}
DESTINATION ${KATIE_CMAKE_RELATIVE}
FILE KatieLibraryTargets.cmake
)
install(
EXPORT KatieBinaryTargets
NAMESPACE Katie::
DESTINATION ${CMAKE_INSTALL_PATH}
DESTINATION ${KATIE_CMAKE_RELATIVE}
FILE KatieBinaryTargets.cmake
)
install(
FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.conf
DESTINATION ${LDCONF_INSTALL_PATH}
DESTINATION ${KATIE_LDCONF_RELATIVE}
)
install(
FILES ${CMAKE_BINARY_DIR}/katie-${KATIE_ARCHITECTURE}.sh
DESTINATION ${PROFILE_INSTALL_PATH}
DESTINATION ${KATIE_PROFILE_RELATIVE}
)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)

59
cmake/KatieConfig.cmake
View file

@ -22,7 +22,7 @@ include("${KATIE_CMAKE_DIR}/KatieBinaryTargets.cmake")
# These are pre-set and dynamically set variables, some use IMPORTED targets
set(KATIE_DEFINITIONS @KATIE_DEFINITIONS@)
set(KATIE_INCLUDES "@QT_HEADERS_PATH@")
set(KATIE_INCLUDES "@KATIE_HEADERS_FULL@")
set(KATIE_LIBRARIES)
set(KATIE_COMPONENTS @KATIE_COMPONENTS@)
set(KATIE_TOOLS @KATIE_TOOLS@)
@ -32,11 +32,11 @@ set(KATIE_MKSPECS "${KATIE_MKSPECS_DIR}/mkspecs.cmake")
foreach(component ${KATIE_COMPONENTS})
string(TOUPPER ${component} uppercomp)
if(uppercomp STREQUAL "MAIN")
set(KATIE_INCLUDES ${KATIE_INCLUDES} "@QT_HEADERS_PATH@")
set(KATIE_${uppercomp}_INCLUDES "@QT_HEADERS_PATH@")
set(KATIE_INCLUDES ${KATIE_INCLUDES} "@KATIE_HEADERS_FULL@")
set(KATIE_${uppercomp}_INCLUDES "@KATIE_HEADERS_FULL@")
else()
set(KATIE_INCLUDES ${KATIE_INCLUDES} "@QT_HEADERS_PATH@/Qt${component}")
set(KATIE_${uppercomp}_INCLUDES "@QT_HEADERS_PATH@/Qt${component}")
set(KATIE_INCLUDES ${KATIE_INCLUDES} "@KATIE_HEADERS_FULL@/Qt${component}")
set(KATIE_${uppercomp}_INCLUDES "@KATIE_HEADERS_FULL@/Qt${component}")
endif()
set(KATIE_LIBRARIES ${KATIE_LIBRARIES} Katie::${component})
@ -60,25 +60,21 @@ else()
endif()
# The stored configuration paths that vendors usually change
set(LDCONF_INSTALL_PATH "@LDCONF_INSTALL_PATH@")
set(PROFILE_INSTALL_PATH "@PROFILE_INSTALL_PATH@")
set(MAN_INSTALL_PATH "@MAN_INSTALL_PATH@")
set(CMAKE_INSTALL_PATH "@CMAKE_INSTALL_PATH@")
set(APPLICATIONS_INSTALL_PATH "@APPLICATIONS_INSTALL_PATH@")
set(PIXMAPS_INSTALL_PATH "@PIXMAPS_INSTALL_PATH@")
set(QT_PREFIX_PATH "@QT_PREFIX_PATH@")
set(QT_HEADERS_PATH "@QT_HEADERS_PATH@")
set(QT_LIBRARIES_PATH "@QT_LIBRARIES_PATH@")
set(QT_BINARIES_PATH "@QT_BINARIES_PATH@")
set(QT_PLUGINS_PATH "@QT_PLUGINS_PATH@")
set(QT_IMPORTS_PATH "@QT_IMPORTS_PATH@")
set(QT_DATA_PATH "@QT_DATA_PATH@")
set(QT_TRANSLATIONS_PATH "@QT_TRANSLATIONS_PATH@")
set(QT_DOCUMENTATION_PATH "@QT_DOCUMENTATION_PATH@")
set(QT_EXAMPLES_PATH "@QT_EXAMPLES_PATH@")
set(QT_DEMOS_PATH "@QT_DEMOS_PATH@")
set(QT_SETTINGS_PATH "@QT_SETTINGS_PATH@")
set(KATIE_PREFIX_PATH "@KATIE_PREFIX_FULL@")
set(KATIE_HEADERS_PATH "@KATIE_HEADERS_FULL@")
set(KATIE_LIBRARIES_PATH "@KATIE_LIBRARIES_FULL@")
set(KATIE_BINARIES_PATH "@KATIE_BINARIES_FULL@")
set(KATIE_PLUGINS_PATH "@KATIE_PLUGINS_FULL@")
set(KATIE_IMPORTS_PATH "@KATIE_IMPORTS_FULL@")
set(KATIE_DATA_PATH "@KATIE_DATA_FULL@")
set(KATIE_TRANSLATIONS_PATH "@KATIE_TRANSLATIONS_FULL@")
set(KATIE_SETTINGS_PATH "@KATIE_SETTINGS_FULL@")
set(KATIE_LDCONF_PATH "@KATIE_LDCONF_FULL@")
set(KATIE_PROFILE_PATH "@KATIE_PROFILE_FULL@")
set(KATIE_MAN_PATH "@KATIE_MAN_FULL@")
set(KATIE_CMAKE_PATH "@KATIE_CMAKE_FULL@")
set(KATIE_APPLICATIONS_PATH "@KATIE_APPLICATIONS_FULL@")
set(KATIE_PIXMAPS_PATH "@KATIE_PIXMAPS_FULL@")
if(NOT "${KATIE_FIND_QUIETLY}")
message(STATUS "Found Katie version: ${KATIE_VERSION}")
@ -102,10 +98,9 @@ if(NOT KATIE_COMPAT EQUAL FALSE AND NOT KATIE_COMPAT EQUAL OFF)
set(QT_USE_FILE ${KATIE_MKSPECS})
set(QT_MKSPECS_DIR ${KATIE_MKSPECS_DIR})
set(_binsuffix "${CMAKE_EXECUTABLE_SUFFIX}")
# those are exceptions because they have "q" prefix which the macros from Qt4Macros do not expect
set(QT_DBUSXML2CPP_EXECUTABLE "@QT_BINARIES_PATH@/qdbusxml2cpp${_binsuffix}")
set(QT_DBUSCPP2XML_EXECUTABLE "@QT_BINARIES_PATH@/qdbuscpp2xml${_binsuffix}")
set(QT_DBUSXML2CPP_EXECUTABLE "${KATIE_BINARIES_PATH}/qdbusxml2cpp${CMAKE_EXECUTABLE_SUFFIX}")
set(QT_DBUSCPP2XML_EXECUTABLE "${KATIE_BINARIES_PATH}/qdbuscpp2xml${CMAKE_EXECUTABLE_SUFFIX}")
if(NOT KATIE_COMPAT_ISSET)
set(KATIE_COMPAT_ISSET CACHE BOOL TRUE "")
@ -121,10 +116,10 @@ if(NOT KATIE_COMPAT EQUAL FALSE AND NOT KATIE_COMPAT EQUAL OFF)
set_property(
TARGET Qt4::${tool}
PROPERTY
IMPORTED_LOCATION "@QT_BINARIES_PATH@/${tool}${_binsuffix}"
IMPORTED_LOCATION "${KATIE_BINARIES_PATH}/${tool}${CMAKE_EXECUTABLE_SUFFIX}"
)
string(TOUPPER ${tool} uppertool)
set(QT_${uppertool}_EXECUTABLE "@QT_BINARIES_PATH@/${tool}${_binsuffix}")
set(QT_${uppertool}_EXECUTABLE "${KATIE_BINARIES_PATH}/${tool}${CMAKE_EXECUTABLE_SUFFIX}")
endforeach()
foreach(component ${KATIE_COMPONENTS})
@ -132,7 +127,7 @@ if(NOT KATIE_COMPAT EQUAL FALSE AND NOT KATIE_COMPAT EQUAL OFF)
set_property(
TARGET Qt4::Qt${component}
PROPERTY
IMPORTED_LOCATION "@QT_LIBRARIES_PATH@/libKt${component}${_libsuffix}"
IMPORTED_LOCATION "${KATIE_LIBRARIES_PATH}/libKt${component}${_libsuffix}"
)
endforeach()
endif()
@ -151,8 +146,8 @@ if(NOT KATIE_COMPAT EQUAL FALSE AND NOT KATIE_COMPAT EQUAL OFF)
set(QT4_QT${uppercomp}_LIBRARY "${KATIE_${uppercomp}_LIBRARIES}")
set(QT_QT${uppercomp}_LIBRARIES "${KATIE_${uppercomp}_LIBRARIES}")
set(QT4_QT${uppercomp}_LIBRARIES "${KATIE_${uppercomp}_LIBRARIES}")
set(QT_QT${uppercomp}_INCLUDE_DIR "@QT_HEADERS_PATH@" "${KATIE_${uppercomp}_INCLUDES}")
set(QT4_QT${uppercomp}_INCLUDE_DIR "@QT_HEADERS_PATH@" "${KATIE_${uppercomp}_INCLUDES}")
set(QT_QT${uppercomp}_INCLUDE_DIR "${KATIE_HEADERS_PATH}" "${KATIE_${uppercomp}_INCLUDES}")
set(QT4_QT${uppercomp}_INCLUDE_DIR "${KATIE_HEADERS_PATH}" "${KATIE_${uppercomp}_INCLUDES}")
# TODO: component definitions
endforeach()

2
cmake/ld.so.conf.cmake
View file

@ -1 +1 @@
@QT_LIBRARIES_PATH@
@KATIE_LIBRARIES_FULL@

26
cmake/modules/KatieBuildMacros.cmake
View file

@ -94,7 +94,7 @@ macro(KATIE_GENERATE_PACKAGE FORTARGET REQUIRES)
katie_setup_paths()
install(
FILES ${CMAKE_BINARY_DIR}/pkgconfig/${FORTARGET}.pc
DESTINATION ${QT_LIBRARIES_PATH}/pkgconfig
DESTINATION ${KATIE_PKGCONFIG_RELATIVE}
)
endif()
endmacro()
@ -220,23 +220,14 @@ endmacro()
function(KATIE_SETUP_PATHS)
set(instpaths
_PREFIX _HEADERS _LIBRARIES _BINARIES _PLUGINS _IMPORTS _DATA
_TRANSLATIONS _DOCUMENTATION _EXAMPLES _DEMOS _SETTINGS
)
set(miscpaths
CMAKE_ LDCONF_ PROFILE_ MAN_ APPLICATIONS_ PIXMAPS_
_TRANSLATIONS _SETTINGS
_CMAKE _LDCONF _PROFILE _MAN _APPLICATIONS _PIXMAPS _PKGCONFIG
)
foreach(instpath ${instpaths})
string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}/" "" modpath "${QT${instpath}_PATH}")
string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}/" "" modpath "${KATIE${instpath}_FULL}")
string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}" "" modpath "${modpath}")
set(QT${instpath}_PATH "${modpath}" PARENT_SCOPE)
# message(STATUS "QT${instpath}_PATH: ${modpath}")
endforeach()
foreach(instpath ${miscpaths})
string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}/" "" modpath "${${instpath}INSTALL_PATH}")
string(REGEX REPLACE ".*${CMAKE_INSTALL_PREFIX}" "" modpath "${modpath}")
set(${instpath}INSTALL_PATH "${modpath}" PARENT_SCOPE)
# message(STATUS "${instpath}INSTALL_PATH: ${modpath}")
set(KATIE${instpath}_RELATIVE "${modpath}" PARENT_SCOPE)
# message(STATUS "KATIE${instpath}_RELATIVE: ${modpath}")
endforeach()
endfunction()
@ -245,12 +236,9 @@ endfunction()
macro(KATIE_OPTIMIZE_HEADERS DIR)
find_program(unifdef NAMES unifdef)
if(unifdef)
# since CMAKE_INSTALL_PREFIX is removed due to previous calls to katie_setup_paths()
# add it to HEADERS_DIRECTORY explicitly. that would not be a problem when
# GNUInstallDirs is used and the full path alternative is passed to this macro
install(
CODE "set(UNIFDEF_EXECUTABLE \"${unifdef}\")"
CODE "set(HEADERS_DIRECTORY \"${CMAKE_INSTALL_PREFIX}/${DIR}\")"
CODE "set(HEADERS_DIRECTORY \"${DIR}\")"
CODE "set(HEADERS_DEFINITIONS \"${ARGN}\")"
SCRIPT "${CMAKE_SOURCE_DIR}/cmake/modules/OptimizeHeaders.cmake"
)

4
cmake/modules/KatieMacros.cmake
View file

@ -80,7 +80,7 @@ macro(KATIE_DBUS_INTERFACE SRCIN)
endmacro()
macro(KATIE_TRANSLATIONS TRANSLATIONS)
if(NOT QT_TRANSLATIONS_PATH)
if(NOT KATIE_TRANSLATIONS_RELATIVE)
message(SEND_ERROR "Directory where the translation should be installed is not set")
endif()
foreach(translation ${TRANSLATIONS} ${ARGN})
@ -94,7 +94,7 @@ macro(KATIE_TRANSLATIONS TRANSLATIONS)
COMMAND "${KATIE_LRELEASE}" "${translation}" -qm "${trout}"
)
set_source_files_properties(${trout} PROPERTIES GENERATED TRUE)
install(FILES ${trout} DESTINATION ${QT_TRANSLATIONS_PATH})
install(FILES ${trout} DESTINATION ${KATIE_TRANSLATIONS_RELATIVE})
endforeach()
endmacro()

12
cmake/pkgconfig.cmake
View file

@ -1,11 +1,11 @@
prefix=${CMAKE_INSTALL_PREFIX}
exec_prefix=${CMAKE_INSTALL_PREFIX}
libdir=${QT_LIBRARIES_PATH}
includedir=${QT_HEADERS_PATH}/${PACKAGE_FAKE}
prefix=${KATIE_PREFIX_FULL}
exec_prefix=${KATIE_PREFIX_FULL}
libdir=${KATIE_LIBRARIES_FULL}
includedir=${KATIE_HEADERS_FULL}/${PACKAGE_FAKE}
Name: ${PACKAGE_NAME}
Description: ${PACKAGE_NAME} Library
Version: ${KATIE_VERSION}
Libs: -L${QT_LIBRARIES_PATH} -l${PACKAGE_NAME}
Cflags: -I${QT_HEADERS_PATH} -I${QT_HEADERS_PATH}/${PACKAGE_FAKE} ${PACKAGE_FLAGS}
Libs: -L${KATIE_LIBRARIES_FULL} -l${PACKAGE_NAME}
Cflags: -I${KATIE_HEADERS_FULL} -I${KATIE_HEADERS_FULL}/${PACKAGE_FAKE} ${PACKAGE_FLAGS}
Requires: ${PACKAGE_REQUIRES}

10
cmake/profile.sh.cmake
View file

@ -1,15 +1,15 @@
#!/bin/sh
if [ -n "$LD_LIBRARY_PATH" ];then
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@QT_LIBRARIES_PATH@"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:@KATIE_LIBRARIES_FULL@"
else
export LD_LIBRARY_PATH="@QT_LIBRARIES_PATH@"
export LD_LIBRARY_PATH="@KATIE_LIBRARIES_FULL@"
fi
if [ -n "$PKG_CONFIG_PATH" ];then
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:@QT_LIBRARIES_PATH@/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:@KATIE_PKGCONFIG_FULL@"
else
export PKG_CONFIG_PATH="@QT_LIBRARIES_PATH@/pkgconfig"
export PKG_CONFIG_PATH="@KATIE_PKGCONFIG_FULL@"
fi
export Katie_DIR="@CMAKE_INSTALL_PATH@"
export Katie_DIR="@KATIE_CMAKE_FULL@"

27
mkspecs/mkspecs.cmake
View file

@ -1,4 +1,3 @@
string(TIMESTAMP KATIE_DATE "%Y-%m-%d")
set(KATIE_MAJOR "4")
set(KATIE_MINOR "9")
set(KATIE_MICRO "0")
@ -6,10 +5,6 @@ set(KATIE_HEX "0x040900")
set(KATIE_NAME "Katie")
set(KATIE_VERSION "${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
set(KATIE_STRING "katie ${KATIE_MAJOR}.${KATIE_MINOR}.${KATIE_MICRO}")
set(KATIE_BUGREPORT "xakepa10@gmail.com")
set(KATIE_URL "http://github.com/fluxer/katie")
set(QT_LICENSE "Open Source")
set(QT_PRODUCT "AwesomeSauce") # it's not a bug, it's a feature!
# KatieConfig overrides that
if(NOT KATIE_MKSPECS_DIR)
@ -99,32 +94,10 @@ elseif("${KATIE_COMPILER}" MATCHES "(gcc|clang)")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif()
# TODO: make use of GNUInstallDirs
set(QT_PREFIX_PATH "${CMAKE_INSTALL_PREFIX}" CACHE PATH "General installation prefix")
set(QT_HEADERS_PATH "${QT_PREFIX_PATH}/include/katie" CACHE PATH "Headers installation path")
set(QT_LIBRARIES_PATH "${QT_PREFIX_PATH}/lib/katie" CACHE PATH "Libraries installation path")
set(QT_BINARIES_PATH "${QT_LIBRARIES_PATH}/bin" CACHE PATH "Binaries installation path")
set(QT_PLUGINS_PATH "${QT_LIBRARIES_PATH}/plugins" CACHE PATH "Plugins installation path")
set(QT_IMPORTS_PATH "${QT_LIBRARIES_PATH}/imports" CACHE PATH "Declerative imports installation path")
set(QT_DATA_PATH "${QT_PREFIX_PATH}/share" CACHE PATH "Generic data installation path")
set(QT_TRANSLATIONS_PATH "${QT_DATA_PATH}/translations" CACHE PATH "Translations instllation path")
set(QT_DOCUMENTATION_PATH "${QT_DATA_PATH}/doc" CACHE PATH "Documenation installation path")
set(QT_EXAMPLES_PATH "${QT_DATA_PATH}/examples" CACHE PATH "Examples installation path")
set(QT_DEMOS_PATH "${QT_DATA_PATH}/demos" CACHE PATH "Demos installation path")
set(QT_SETTINGS_PATH "/etc/xdg" CACHE PATH "Settings runtime path")
if(EXISTS ${KATIE_MKSPECS_DIR}/${KATIE_PLATFORM}/${KATIE_PLATFORM}.cmake)
include(${KATIE_MKSPECS_DIR}/${KATIE_PLATFORM}/${KATIE_PLATFORM}.cmake)
endif()
# misc paths, relevant mostly for UNIX-like platforms
set(CMAKE_INSTALL_PATH "${QT_DATA_PATH}/cmake/Katie" CACHE PATH "CMake aware modules path")
set(LDCONF_INSTALL_PATH "${QT_DATA_PATH}/ld.so.conf.d" CACHE PATH "Run-time linker/loader configs path (UNIX)")
set(PROFILE_INSTALL_PATH "${QT_DATA_PATH}/profile.d" CACHE PATH "Shell profile scripts path (UNIX)")
set(MAN_INSTALL_PATH "${QT_DATA_PATH}/man" CACHE PATH "Manual pages path (UNIX)")
set(APPLICATIONS_INSTALL_PATH "${QT_DATA_PATH}/applications" CACHE PATH "Desktop applications register path (UNIX)")
set(PIXMAPS_INSTALL_PATH "${QT_DATA_PATH}/pixmaps" CACHE PATH "Desktop applications icon path (UNIX)")
# for distributions to override build specifications, do note that paths specified on the command
# line during configuration override even that file
if(EXISTS ${KATIE_MKSPECS_DIR}/${KATIE_PLATFORM}/vendor.cmake)

7
src/core/CMakeLists.txt
View file

@ -339,7 +339,6 @@ katie_generate_misc("${CORE_HEADERS}" QtCore)
katie_generate_public("${CORE_PUBLIC_HEADERS}" QtCore)
katie_generate_package(KtCore "")
katie_setup_target(KtCore ${CORE_SOURCES} ${CORE_HEADERS})
katie_setup_paths()
add_library(KtCore ${KATIE_TYPE} ${KtCore_SOURCES})
target_link_libraries(KtCore ${EXTRA_CORE_LIBS})
@ -352,13 +351,13 @@ set_target_properties(KtCore PROPERTIES
install(
TARGETS KtCore
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtCore
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtCore)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtCore)

25
src/core/global/qconfig.cpp.cmake
View file

@ -43,18 +43,15 @@
static const char* qt_configure_installation = "${KATIE_DATE}";
/* License Info */
static const char* qt_configure_licensee_str = "${QT_LICENSE}\0";
static const char* qt_configure_licensed_products_str = "${QT_PRODUCT}\0";
static const char* qt_configure_licensee_str = "${KATIE_LICENSE}\0";
static const char* qt_configure_licensed_products_str = "${KATIE_PRODUCT}\0";
static const char* qt_configure_prefix_path_str = "${QT_PREFIX_PATH}\0";
static const char* qt_configure_headers_path_str = "${QT_HEADERS_PATH}\0";
static const char* qt_configure_libraries_path_str = "${QT_LIBRARIES_PATH}\0";
static const char* qt_configure_binaries_path_str = "${QT_BINARIES_PATH}\0";
static const char* qt_configure_plugins_path_str = "${QT_PLUGINS_PATH}\0";
static const char* qt_configure_imports_path_str = "${QT_IMPORTS_PATH}\0";
static const char* qt_configure_data_path_str = "${QT_DATA_PATH}\0";
static const char* qt_configure_translations_path_str = "${QT_TRANSLATIONS_PATH}\0";
static const char* qt_configure_settings_path_str = "${QT_SETTINGS_PATH}\0";
static const char* qt_configure_documentation_path_str = "${QT_DOCUMENTATION_PATH}\0";
static const char* qt_configure_examples_path_str = "${QT_EXAMPLES_PATH}\0";
static const char* qt_configure_demos_path_str = "${QT_DEMOS_PATH}\0";
static const char* qt_configure_prefix_path_str = "${KATIE_PREFIX_FULL}\0";
static const char* qt_configure_headers_path_str = "${KATIE_HEADERS_FULL}\0";
static const char* qt_configure_libraries_path_str = "${KATIE_LIBRARIES_FULL}\0";
static const char* qt_configure_binaries_path_str = "${KATIE_BINARIES_FULL}\0";
static const char* qt_configure_plugins_path_str = "${KATIE_PLUGINS_FULL}\0";
static const char* qt_configure_imports_path_str = "${KATIE_IMPORTS_FULL}\0";
static const char* qt_configure_data_path_str = "${KATIE_DATA_FULL}\0";
static const char* qt_configure_translations_path_str = "${KATIE_TRANSLATIONS_FULL}\0";
static const char* qt_configure_settings_path_str = "${KATIE_SETTINGS_FULL}\0";

12
src/core/global/qlibraryinfo.cpp
View file

@ -192,15 +192,6 @@ QLibraryInfo::location(LibraryLocation loc)
case SettingsPath:
ret = QString::fromLocal8Bit(qt_configure_settings_path_str);
break;
case DocumentationPath:
ret = QString::fromLocal8Bit(qt_configure_documentation_path_str);
break;
case ExamplesPath:
ret = QString::fromLocal8Bit(qt_configure_examples_path_str);
break;
case DemosPath:
ret = QString::fromLocal8Bit(qt_configure_demos_path_str);
break;
default:
break;
}
@ -246,7 +237,6 @@ QLibraryInfo::location(LibraryLocation loc)
specifier:
\value PrefixPath The default prefix for all paths.
\value DocumentationPath The location for documentation upon install.
\value HeadersPath The location for all headers.
\value LibrariesPath The location of installed libraries.
\value BinariesPath The location of installed Qt binaries (tools and applications).
@ -255,8 +245,6 @@ QLibraryInfo::location(LibraryLocation loc)
\value DataPath The location of general Qt data.
\value TranslationsPath The location of translation information for Qt strings.
\value SettingsPath The location for Qt settings.
\value ExamplesPath The location for examples upon install.
\value DemosPath The location for demos upon install.
\sa location()
*/

5
src/core/global/qlibraryinfo.h
View file

@ -66,7 +66,6 @@ public:
enum LibraryLocation
{
PrefixPath,
DocumentationPath,
HeadersPath,
LibrariesPath,
BinariesPath,
@ -74,11 +73,9 @@ public:
DataPath,
TranslationsPath,
SettingsPath,
DemosPath,
ExamplesPath,
ImportsPath
};
static QString location(LibraryLocation); // ### Qt 5: consider renaming it to path()
static QString location(LibraryLocation);
private:
QLibraryInfo();

7
src/dbus/CMakeLists.txt
View file

@ -109,7 +109,6 @@ katie_generate_misc("${DBUS_HEADERS}" QtDBus)
katie_generate_public("${DBUS_PUBLIC_HEADERS}" QtDBus)
katie_generate_package(KtDBus "KtCore KtXml")
katie_setup_target(KtDBus ${DBUS_SOURCES} ${DBUS_HEADERS})
katie_setup_paths()
add_library(KtDBus ${KATIE_TYPE} ${KtDBus_SOURCES})
target_link_libraries(KtDBus ${EXTRA_DBUS_LIBS})
@ -122,13 +121,13 @@ set_target_properties(KtDBus PROPERTIES
install(
TARGETS KtDBus
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDBus
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtDBus)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtDBus)

7
src/declarative/CMakeLists.txt
View file

@ -69,7 +69,6 @@ katie_generate_misc("${DECLARATIVE_HEADERS}" QtDeclarative)
katie_generate_public("${DECLARATIVE_PUBLIC_HEADERS}" QtDeclarative)
katie_generate_package(KtDeclarative "KtCore KtGui KtNetwork KtScript")
katie_setup_target(KtDeclarative ${DECLARATIVE_SOURCES} ${DECLARATIVE_HEADERS})
katie_setup_paths()
add_library(KtDeclarative ${KATIE_TYPE} ${KtDeclarative_SOURCES})
target_link_libraries(KtDeclarative ${EXTRA_DECLARATIVE_LIBS})
@ -82,13 +81,13 @@ set_target_properties(KtDeclarative PROPERTIES
install(
TARGETS KtDeclarative
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDeclarative
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtDeclarative)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtDeclarative)

7
src/designer/CMakeLists.txt
View file

@ -121,7 +121,6 @@ katie_generate_misc("${DESIGNER_HEADERS}" QtDesigner)
katie_generate_public("${DESIGNER_PUBLIC_HEADERS}" QtDesigner)
katie_generate_package(KtDesigner "KtCore KtGui KtXml KtUiTools")
katie_setup_target(KtDesigner ${DESIGNER_SOURCES} ${DESIGNER_HEADERS})
katie_setup_paths()
add_library(KtDesigner ${KATIE_TYPE} ${KtDesigner_SOURCES}
$<TARGET_OBJECTS:sharedqtgradienteditor>
@ -141,13 +140,13 @@ katie_setup_object(KtDesigner sharedqtgradienteditor sharedqtpropertybrowser sha
install(
TARGETS KtDesigner
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDesigner
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtDesigner)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtDesigner)

5
src/designer/components/CMakeLists.txt
View file

@ -86,7 +86,6 @@ katie_generate_misc("${DESIGNERCOMPONENTS_HEADERS}" QtDesignerComponents)
katie_generate_public("${DESIGNERCOMPONENTS_PUBLIC_HEADERS}" QtDesignerComponents)
katie_generate_package(KtDesignerComponents "KtCore KtGui KtXml KtDesigner KtScript")
katie_setup_target(KtDesignerComponents ${DESIGNERCOMPONENTS_SOURCES} ${DESIGNERCOMPONENTS_HEADERS})
katie_setup_paths()
add_library(KtDesignerComponents ${KATIE_TYPE} ${KtDesignerComponents_SOURCES}
$<TARGET_OBJECTS:sharedfindwidget>
@ -105,11 +104,11 @@ katie_setup_object(KtDesignerComponents sharedfindwidget sharedqtpropertybrowser
install(
TARGETS KtDesignerComponents
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtDesignerComponents
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)

7
src/gui/CMakeLists.txt
View file

@ -497,7 +497,6 @@ katie_generate_misc("${GUI_HEADERS}" QtGui)
katie_generate_public("${GUI_PUBLIC_HEADERS}" QtGui)
katie_generate_package(KtGui "KtCore")
katie_setup_target(KtGui ${GUI_SOURCES} ${GUI_HEADERS})
katie_setup_paths()
# those are set after katie_setup_target() because they are known to cause
# trouble for all-in-one build
@ -538,13 +537,13 @@ set_target_properties(KtGui PROPERTIES
install(
TARGETS KtGui
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtGui
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtGui)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtGui)

2
src/gui/statemachine/qguistatemachine.cpp
View file

@ -49,8 +49,6 @@
QT_BEGIN_NAMESPACE
Q_CORE_EXPORT const QStateMachinePrivate::Handler *qcoreStateMachineHandler();
static QEvent *cloneEvent(QEvent *e)
{
switch (e->type()) {

7
src/help/CMakeLists.txt
View file

@ -91,7 +91,6 @@ katie_generate_misc("${HELP_HEADERS}" QtHelp)
katie_generate_public("${HELP_PUBLIC_HEADERS}" QtHelp)
katie_generate_package(KtHelp "KtCore KtGui KtNetwork KtSql KtXml")
katie_setup_target(KtHelp ${HELP_SOURCES} ${HELP_HEADERS})
katie_setup_paths()
# those are set after katie_setup_target() because they are known to cause
# trouble for all-in-one build
@ -111,13 +110,13 @@ set_target_properties(KtHelp PROPERTIES
install(
TARGETS KtHelp
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtHelp
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtHelp)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtHelp)

5
src/imports/folderlistmodel/folderlistmodel.cmake
View file

@ -11,16 +11,15 @@ set(FOLDERLISTMODEL_HEADERS
)
katie_setup_target(qmlfolderlistmodelplugin ${FOLDERLISTMODEL_SOURCES} ${FOLDERLISTMODEL_HEADERS})
katie_setup_paths()
add_library(qmlfolderlistmodelplugin ${KATIE_TYPE} ${qmlfolderlistmodelplugin_SOURCES})
target_link_libraries(qmlfolderlistmodelplugin ${EXTRA_FOLDERLISTMODEL_LIBS})
install(
TARGETS qmlfolderlistmodelplugin
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/folderlistmodel
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/folderlistmodel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/folderlistmodel/qmldir
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/folderlistmodel
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/folderlistmodel
)

5
src/imports/gestures/gestures.cmake
View file

@ -11,16 +11,15 @@ set(GESTURES_HEADERS
)
katie_setup_target(qmlgesturesplugin ${GESTURES_SOURCES} ${GESTURES_HEADERS})
katie_setup_paths()
add_library(qmlgesturesplugin ${KATIE_TYPE} ${qmlgesturesplugin_SOURCES})
target_link_libraries(qmlgesturesplugin ${EXTRA_GESTURES_LIBS})
install(
TARGETS qmlgesturesplugin
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/gestures
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/gestures
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/gestures/qmldir
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/gestures
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/gestures
)

5
src/imports/particles/particles.cmake
View file

@ -11,16 +11,15 @@ set(PARTICLES_HEADERS
)
katie_setup_target(qmlparticlesplugin ${PARTICLES_SOURCES} ${PARTICLES_HEADERS})
katie_setup_paths()
add_library(qmlparticlesplugin ${KATIE_TYPE} ${qmlparticlesplugin_SOURCES})
target_link_libraries(qmlparticlesplugin ${EXTRA_PARTICLES_LIBS})
install(
TARGETS qmlparticlesplugin
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/particles
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/particles
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/particles/qmldir
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/particles
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/particles
)

5
src/imports/shaders/shaders.cmake
View file

@ -23,16 +23,15 @@ set(SHADERS_HEADERS
include_directories(${OPENGL_INCLUDE_DIR})
katie_setup_target(qmlshadersplugin ${SHADERS_SOURCES} ${SHADERS_HEADERS})
katie_setup_paths()
add_library(qmlshadersplugin ${KATIE_TYPE} ${qmlshadersplugin_SOURCES})
target_link_libraries(qmlshadersplugin ${EXTRA_SHADERS_LIBS})
install(
TARGETS qmlshadersplugin
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/shaders
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/shaders
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/shaders/qmldir
DESTINATION ${QT_IMPORTS_PATH}/Qt/labs/shaders
DESTINATION ${KATIE_IMPORTS_RELATIVE}/Qt/labs/shaders
)

7
src/network/CMakeLists.txt
View file

@ -90,7 +90,6 @@ katie_generate_misc("${NETWORK_HEADERS}" QtNetwork)
katie_generate_public("${NETWORK_PUBLIC_HEADERS}" QtNetwork)
katie_generate_package(KtNetwork "KtCore")
katie_setup_target(KtNetwork ${NETWORK_SOURCES} ${NETWORK_HEADERS})
katie_setup_paths()
add_library(KtNetwork ${KATIE_TYPE} ${KtNetwork_SOURCES})
target_link_libraries(KtNetwork ${EXTRA_NETWORK_LIBS})
@ -103,13 +102,13 @@ set_target_properties(KtNetwork PROPERTIES
install(
TARGETS KtNetwork
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtNetwork
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtNetwork)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtNetwork)

7
src/opengl/CMakeLists.txt
View file

@ -167,7 +167,6 @@ katie_generate_misc("${OPENGL_HEADERS}" QtOpenGL)
katie_generate_public("${OPENGL_PUBLIC_HEADERS}" QtOpenGL)
katie_generate_package(KtOpenGL "KtCore KtGui")
katie_setup_target(KtOpenGL ${OPENGL_SOURCES} ${OPENGL_HEADERS})
katie_setup_paths()
add_library(KtOpenGL ${KATIE_TYPE} ${KtOpenGL_SOURCES})
target_link_libraries(KtOpenGL ${EXTRA_OPENGL_LIBS})
@ -180,13 +179,13 @@ set_target_properties(KtOpenGL PROPERTIES
install(
TARGETS KtOpenGL
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtOpenGL
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtOpenGL)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtOpenGL)

2
src/plugins/CMakeLists.txt
View file

@ -1,7 +1,5 @@
add_definitions(-DQT_PLUGIN)
katie_setup_paths()
include_directories(
${CMAKE_BINARY_DIR}/include
${CMAKE_BINARY_DIR}/privateinclude

2
src/plugins/accessible/widgets/widgets.cmake
View file

@ -28,5 +28,5 @@ target_include_directories(qtaccessiblewidgetsplugin PRIVATE ${CMAKE_CURRENT_SOU
install(
TARGETS qtaccessiblewidgetsplugin
DESTINATION ${QT_PLUGINS_PATH}/accessible
DESTINATION ${KATIE_PLUGINS_RELATIVE}/accessible
)

2
src/plugins/bearer/connman/connman.cmake
View file

@ -31,5 +31,5 @@ target_include_directories(qconnmanbearerplugin PRIVATE
install(
TARGETS qconnmanbearerplugin
DESTINATION ${QT_PLUGINS_PATH}/bearer
DESTINATION ${KATIE_PLUGINS_RELATIVE}/bearer
)

2
src/plugins/bearer/generic/generic.cmake
View file

@ -23,5 +23,5 @@ set_target_properties(qgenericbearerplugin PROPERTIES OUTPUT_NAME qgenericbearer
install(
TARGETS qgenericbearerplugin
DESTINATION ${QT_PLUGINS_PATH}/bearer
DESTINATION ${KATIE_PLUGINS_RELATIVE}/bearer
)

2
src/plugins/bearer/networkmanager/networkmanager.cmake
View file

@ -26,5 +26,5 @@ set_target_properties(qnmbearerplugin PROPERTIES OUTPUT_NAME qnmbearer)
install(
TARGETS qnmbearerplugin
DESTINATION ${QT_PLUGINS_PATH}/bearer
DESTINATION ${KATIE_PLUGINS_RELATIVE}/bearer
)

2
src/plugins/codecs/cn/cn.cmake
View file

@ -14,5 +14,5 @@ set_target_properties(qcncodecsplugin PROPERTIES OUTPUT_NAME qcncodecs)
install(
TARGETS qcncodecsplugin
DESTINATION ${QT_PLUGINS_PATH}/codecs
DESTINATION ${KATIE_PLUGINS_RELATIVE}/codecs
)

2
src/plugins/codecs/jp/jp.cmake
View file

@ -23,5 +23,5 @@ set_target_properties(qjpcodecsplugin PROPERTIES OUTPUT_NAME qjpcodecs)
install(
TARGETS qjpcodecsplugin
DESTINATION ${QT_PLUGINS_PATH}/codecs
DESTINATION ${KATIE_PLUGINS_RELATIVE}/codecs
)

2
src/plugins/codecs/kr/kr.cmake
View file

@ -16,5 +16,5 @@ set_target_properties(qkrcodecsplugin PROPERTIES OUTPUT_NAME qkrcodecs)
install(
TARGETS qkrcodecsplugin
DESTINATION ${QT_PLUGINS_PATH}/codecs
DESTINATION ${KATIE_PLUGINS_RELATIVE}/codecs
)

2
src/plugins/codecs/tw/tw.cmake
View file

@ -15,5 +15,5 @@ set_target_properties(qtwcodecsplugin PROPERTIES OUTPUT_NAME qtwcodecs)
install(
TARGETS qtwcodecsplugin
DESTINATION ${QT_PLUGINS_PATH}/codecs
DESTINATION ${KATIE_PLUGINS_RELATIVE}/codecs
)

2
src/plugins/designer/qdeclarativeview/qdeclarativeview.cmake
View file

@ -19,5 +19,5 @@ target_compile_definitions(qdeclarativeviewplugin PRIVATE -DQDESIGNER_SDK_LIBRAR
install(
TARGETS qdeclarativeviewplugin
DESTINATION ${QT_PLUGINS_PATH}/designer
DESTINATION ${KATIE_PLUGINS_RELATIVE}/designer
)

2
src/plugins/graphicssystems/opengl/opengl.cmake
View file

@ -12,5 +12,5 @@ set_target_properties(qglgraphicssystemplugin PROPERTIES OUTPUT_NAME qglgraphics
install(
TARGETS qglgraphicssystemplugin
DESTINATION ${QT_PLUGINS_PATH}/graphicssystems
DESTINATION ${KATIE_PLUGINS_RELATIVE}/graphicssystems
)

2
src/plugins/iconengines/svgiconengine/svgiconengine.cmake
View file

@ -15,5 +15,5 @@ set_target_properties(qsvgiconplugin PROPERTIES OUTPUT_NAME qsvgicon)
install(
TARGETS qsvgiconplugin
DESTINATION ${QT_PLUGINS_PATH}/iconengines
DESTINATION ${KATIE_PLUGINS_RELATIVE}/iconengines
)

2
src/plugins/imageformats/gif/gif.cmake
View file

@ -11,5 +11,5 @@ set_target_properties(qgifplugin PROPERTIES OUTPUT_NAME qgif)
install(
TARGETS qgifplugin
DESTINATION ${QT_PLUGINS_PATH}/imageformats
DESTINATION ${KATIE_PLUGINS_RELATIVE}/imageformats
)

2
src/plugins/imageformats/ico/ico.cmake
View file

@ -15,5 +15,5 @@ set_target_properties(qicoplugin PROPERTIES OUTPUT_NAME qico)
install(
TARGETS qicoplugin
DESTINATION ${QT_PLUGINS_PATH}/imageformats
DESTINATION ${KATIE_PLUGINS_RELATIVE}/imageformats
)

2
src/plugins/imageformats/jpeg/jpeg.cmake
View file

@ -11,5 +11,5 @@ set_target_properties(qjpegplugin PROPERTIES OUTPUT_NAME qjpeg)
install(
TARGETS qjpegplugin
DESTINATION ${QT_PLUGINS_PATH}/imageformats
DESTINATION ${KATIE_PLUGINS_RELATIVE}/imageformats
)

2
src/plugins/imageformats/mng/mng.cmake
View file

@ -11,5 +11,5 @@ set_target_properties(qmngplugin PROPERTIES OUTPUT_NAME qmng)
install(
TARGETS qmngplugin
DESTINATION ${QT_PLUGINS_PATH}/imageformats
DESTINATION ${KATIE_PLUGINS_RELATIVE}/imageformats
)

2
src/plugins/imageformats/svg/svg.cmake
View file

@ -15,5 +15,5 @@ set_target_properties(qsvgplugin PROPERTIES OUTPUT_NAME qsvg)
install(
TARGETS qsvgplugin
DESTINATION ${QT_PLUGINS_PATH}/imageformats
DESTINATION ${KATIE_PLUGINS_RELATIVE}/imageformats
)

2
src/plugins/imageformats/tga/tga.cmake
View file

@ -17,5 +17,5 @@ set_target_properties(qtgaplugin PROPERTIES OUTPUT_NAME qtga)
install(
TARGETS qtgaplugin
DESTINATION ${QT_PLUGINS_PATH}/imageformats
DESTINATION ${KATIE_PLUGINS_RELATIVE}/imageformats
)

2
src/plugins/imageformats/tiff/tiff.cmake
View file

@ -11,5 +11,5 @@ set_target_properties(qtiffplugin PROPERTIES OUTPUT_NAME qtiff)
install(
TARGETS qtiffplugin
DESTINATION ${QT_PLUGINS_PATH}/imageformats
DESTINATION ${KATIE_PLUGINS_RELATIVE}/imageformats
)

2
src/plugins/inputmethods/imsw-multi/imsw-multi.cmake
View file

@ -20,5 +20,5 @@ set_target_properties(qimsw-multiplugin PROPERTIES OUTPUT_NAME qimsw-multi)
install(
TARGETS qimsw-multiplugin
DESTINATION ${QT_PLUGINS_PATH}/inputmethods
DESTINATION ${KATIE_PLUGINS_RELATIVE}/inputmethods
)

2
src/plugins/script/qtdbus/qtdbus.cmake
View file

@ -19,5 +19,5 @@ target_include_directories(qtscriptdbusplugin PRIVATE ${CMAKE_CURRENT_SOURCE_DIR
install(
TARGETS qtscriptdbusplugin
DESTINATION ${QT_PLUGINS_PATH}/script
DESTINATION ${KATIE_PLUGINS_RELATIVE}/script
)

2
src/plugins/sqldrivers/mysql/mysql.cmake
View file

@ -21,5 +21,5 @@ set_target_properties(qsqlmysqlplugin PROPERTIES OUTPUT_NAME qsqlmysql)
install(
TARGETS qsqlmysqlplugin
DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
DESTINATION ${KATIE_PLUGINS_RELATIVE}/sqldrivers
)

2
src/plugins/sqldrivers/odbc/odbc.cmake
View file

@ -24,5 +24,5 @@ endif()
install(
TARGETS qsqlodbcplugin
DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
DESTINATION ${KATIE_PLUGINS_RELATIVE}/sqldrivers
)

2
src/plugins/sqldrivers/psql/psql.cmake
View file

@ -21,5 +21,5 @@ set_target_properties(qsqlpsqlplugin PROPERTIES OUTPUT_NAME qsqlpsql)
install(
TARGETS qsqlpsqlplugin
DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
DESTINATION ${KATIE_PLUGINS_RELATIVE}/sqldrivers
)

2
src/plugins/sqldrivers/sqlite/sqlite.cmake
View file

@ -21,5 +21,5 @@ set_target_properties(qsqliteplugin PROPERTIES OUTPUT_NAME qsqlite)
install(
TARGETS qsqliteplugin
DESTINATION ${QT_PLUGINS_PATH}/sqldrivers
DESTINATION ${KATIE_PLUGINS_RELATIVE}/sqldrivers
)

7
src/script/CMakeLists.txt
View file

@ -222,7 +222,6 @@ katie_generate_misc("${SCRIPT_HEADERS}" QtScript)
katie_generate_public("${SCRIPT_PUBLIC_HEADERS}" QtScript)
katie_generate_package(KtScript "KtCore")
katie_setup_target(KtScript ${SCRIPT_SOURCES} ${SCRIPT_HEADERS})
katie_setup_paths()
add_library(KtScript ${KATIE_TYPE} ${KtScript_SOURCES})
target_link_libraries(KtScript ${EXTRA_SCRIPT_LIBS})
@ -235,13 +234,13 @@ set_target_properties(KtScript PROPERTIES
install(
TARGETS KtScript
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtScript
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtScript)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtScript)

7
src/scripttools/CMakeLists.txt
View file

@ -32,7 +32,6 @@ katie_generate_misc("${SCRIPTTOOLS_HEADERS}" QtScriptTools)
katie_generate_public("${SCRIPTTOOLS_PUBLIC_HEADERS}" QtScriptTools)
katie_generate_package(KtScriptTools "KtCore KtGui KtScript")
katie_setup_target(KtScriptTools ${SCRIPTTOOLS_SOURCES} ${SCRIPTTOOLS_HEADERS})
katie_setup_paths()
add_library(KtScriptTools ${KATIE_TYPE} ${KtScriptTools_SOURCES})
target_link_libraries(KtScriptTools ${EXTRA_SCRIPTTOOLS_LIBS})
@ -45,13 +44,13 @@ set_target_properties(KtScriptTools PROPERTIES
install(
TARGETS KtScriptTools
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtScriptTools
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtScriptTools)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtScriptTools)

7
src/sql/CMakeLists.txt
View file

@ -65,7 +65,6 @@ katie_generate_misc("${SQL_HEADERS}" QtSql)
katie_generate_public("${SQL_PUBLIC_HEADERS}" QtSql)
katie_generate_package(KtSql "KtCore")
katie_setup_target(KtSql ${SQL_SOURCES} ${SQL_HEADERS})
katie_setup_paths()
add_library(KtSql ${KATIE_TYPE} ${KtSql_SOURCES})
target_link_libraries(KtSql ${EXTRA_SQL_LIBS})
@ -78,13 +77,13 @@ set_target_properties(KtSql PROPERTIES
install(
TARGETS KtSql
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtSql
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtSql)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtSql)

7
src/svg/CMakeLists.txt
View file

@ -72,7 +72,6 @@ katie_generate_misc("${SVG_HEADERS}" QtSvg)
katie_generate_public("${SVG_PUBLIC_HEADERS}" QtSvg)
katie_generate_package(KtSvg "KtCore KtGui")
katie_setup_target(KtSvg ${SVG_SOURCES} ${SVG_HEADERS})
katie_setup_paths()
add_library(KtSvg ${KATIE_TYPE} ${KtSvg_SOURCES})
target_link_libraries(KtSvg ${EXTRA_SVG_LIBS})
@ -85,13 +84,13 @@ set_target_properties(KtSvg PROPERTIES
install(
TARGETS KtSvg
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtSvg
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtSvg)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtSvg)

7
src/test/CMakeLists.txt
View file

@ -110,7 +110,6 @@ katie_generate_misc("${TEST_HEADERS}" QtTest)
katie_generate_public("${TEST_PUBLIC_HEADERS}" QtTest)
katie_generate_package(KtTest "KtCore")
katie_setup_target(KtTest ${TEST_SOURCES} ${TEST_HEADERS})
katie_setup_paths()
add_library(KtTest ${KATIE_TYPE} ${KtTest_SOURCES})
target_link_libraries(KtTest ${EXTRA_TEST_LIBS})
@ -123,13 +122,13 @@ set_target_properties(KtTest PROPERTIES
install(
TARGETS KtTest
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtTest
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtTest)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtTest)

7
src/tools/designer/CMakeLists.txt
View file

@ -87,7 +87,6 @@ configure_file(
katie_setup_target(designer ${DESIGNERBIN_SOURCES} ${DESIGNERBIN_HEADERS})
katie_setup_paths()
add_executable(designer
${designer_SOURCES}
@ -97,17 +96,17 @@ target_link_libraries(designer ${EXTRA_DESIGNERBIN_LIBS})
install(
TARGETS designer
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/designer.desktop
DESTINATION ${APPLICATIONS_INSTALL_PATH}
DESTINATION ${KATIE_APPLICATIONS_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/designer.png
DESTINATION ${PIXMAPS_INSTALL_PATH}
DESTINATION ${KATIE_PIXMAPS_RELATIVE}
COMPONENT Devel
)

4
src/tools/designer/designer.desktop.cmake
View file

@ -1,8 +1,8 @@
[Desktop Entry]
Name=Katie Designer
Comment=Design GUIs for Katie applications
Exec=@QT_BINARIES_PATH@/designer
Icon=@PIXMAPS_INSTALL_PATH@/designer.png
Exec=@KATIE_BINARIES_FULL@/designer@CMAKE_EXECUTABLE_SUFFIX@
Icon=@KATIE_PIXMAPS_FULL@/designer.png
MimeType=application/x-designer;
Terminal=false
Encoding=UTF-8

5
src/tools/lconvert/CMakeLists.txt
View file

@ -26,7 +26,6 @@ set(LCONVERT_HEADERS
)
katie_setup_target(lconvert ${LCONVERT_SOURCES} ${LCONVERT_HEADERS})
katie_setup_paths()
add_executable(lconvert ${lconvert_SOURCES}
$<TARGET_OBJECTS:sharedlinguist>
@ -36,11 +35,11 @@ target_link_libraries(lconvert ${EXTRA_LCONVERT_LIBS})
install(
TARGETS lconvert
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/lconvert.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

5
src/tools/lrelease/CMakeLists.txt
View file

@ -26,7 +26,6 @@ set(LRELEASE_HEADERS
)
katie_setup_target(lrelease ${LRELEASE_SOURCES} ${LRELEASE_HEADERS})
katie_setup_paths()
add_executable(lrelease ${lrelease_SOURCES}
$<TARGET_OBJECTS:sharedlinguist>
@ -36,11 +35,11 @@ target_link_libraries(lrelease ${EXTRA_LRELEASE_LIBS})
install(
TARGETS lrelease
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/lrelease.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

5
src/tools/lupdate/CMakeLists.txt
View file

@ -27,7 +27,6 @@ set(LUPDATE_HEADERS
)
katie_setup_target(lupdate ${LUPDATE_SOURCES} ${LUPDATE_HEADERS})
katie_setup_paths()
add_executable(lupdate ${lupdate_SOURCES}
$<TARGET_OBJECTS:sharedlinguist>
@ -37,11 +36,11 @@ target_link_libraries(lupdate ${EXTRA_LUPDATE_LIBS})
install(
TARGETS lupdate
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/lupdate.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

6
src/tools/moc/CMakeLists.txt
View file

@ -19,8 +19,6 @@ set(MOC_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/token.cpp
)
katie_setup_paths()
add_executable(bootstrap_moc $<TARGET_OBJECTS:bootstrap> ${MOC_SOURCES})
target_compile_definitions(bootstrap_moc PRIVATE ${BOOTSTRAP_DEFINITIONS})
@ -30,11 +28,11 @@ target_link_libraries(moc ${EXTRA_MOC_LIBS})
install(
TARGETS moc
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/moc.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

5
src/tools/qcollectiongenerator/CMakeLists.txt
View file

@ -26,7 +26,6 @@ set(QCOLLECTIONGENERATOR_HEADERS
)
katie_setup_target(qcollectiongenerator ${QCOLLECTIONGENERATOR_SOURCES} ${QCOLLECTIONGENERATOR_HEADERS})
katie_setup_paths()
add_executable(qcollectiongenerator ${qcollectiongenerator_SOURCES}
$<TARGET_OBJECTS:sharedhelp>
@ -36,11 +35,11 @@ target_link_libraries(qcollectiongenerator ${EXTRA_QCOLLECTIONGENERATOR_LIBS})
install(
TARGETS qcollectiongenerator
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/qcollectiongenerator.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

6
src/tools/qdbus/CMakeLists.txt
View file

@ -12,8 +12,6 @@ include_directories(
${CMAKE_BINARY_DIR}/privateinclude/QtDBus
)
katie_setup_paths()
add_executable(qdbus ${CMAKE_CURRENT_SOURCE_DIR}/qdbus.cpp)
target_link_libraries(qdbus ${EXTRA_QDBUS_LIBS})
@ -26,7 +24,7 @@ target_link_libraries(qdbusxml2cpp ${EXTRA_QDBUS_LIBS})
install(
TARGETS qdbus qdbuscpp2xml qdbusxml2cpp
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
@ -35,5 +33,5 @@ install(
${CMAKE_CURRENT_SOURCE_DIR}/qdbus.1
${CMAKE_CURRENT_SOURCE_DIR}/qdbuscpp2xml.1
${CMAKE_CURRENT_SOURCE_DIR}/qdbusxml2cpp.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

7
src/tools/qdbusviewer/CMakeLists.txt
View file

@ -38,7 +38,6 @@ configure_file(
katie_setup_target(qdbusviewer ${QDBUSVIEWER_SOURCES} ${QDBUSVIEWER_HEADERS})
katie_setup_paths()
add_executable(qdbusviewer
${qdbusviewer_SOURCES}
@ -48,17 +47,17 @@ target_link_libraries(qdbusviewer ${EXTRA_QDBUSVIEWER_LIBS})
install(
TARGETS qdbusviewer
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qdbusviewer.desktop
DESTINATION ${APPLICATIONS_INSTALL_PATH}
DESTINATION ${KATIE_APPLICATIONS_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/qdbusviewer.png
DESTINATION ${PIXMAPS_INSTALL_PATH}
DESTINATION ${KATIE_PIXMAPS_RELATIVE}
COMPONENT Devel
)

4
src/tools/qdbusviewer/qdbusviewer.desktop.cmake
View file

@ -1,8 +1,8 @@
[Desktop Entry]
Name=Katie D-Bus Viewer
Comment=Debug D-Bus applications
Exec=@QT_BINARIES_PATH@/qdbusviewer
Icon=@PIXMAPS_INSTALL_PATH@/qdbusviewer.png
Exec=@KATIE_BINARIES_FULL@/qdbusviewer@CMAKE_EXECUTABLE_SUFFIX@
Icon=@KATIE_PIXMAPS_FULL@/qdbusviewer.png
Terminal=false
Encoding=UTF-8
Type=Application

5
src/tools/qhelpgenerator/CMakeLists.txt
View file

@ -24,7 +24,6 @@ set(QHELPGENERATOR_HEADERS
)
katie_setup_target(qhelpgenerator ${QHELPGENERATOR_SOURCES} ${QHELPGENERATOR_HEADERS})
katie_setup_paths()
add_executable(qhelpgenerator ${qhelpgenerator_SOURCES}
$<TARGET_OBJECTS:sharedhelp>
@ -34,11 +33,11 @@ target_link_libraries(qhelpgenerator ${EXTRA_QHELPGENERATOR_LIBS})
install(
TARGETS qhelpgenerator
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/qhelpgenerator.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

5
src/tools/qscript/CMakeLists.txt
View file

@ -22,7 +22,6 @@ set(QSCRIPT_HEADERS
)
katie_setup_target(qscript ${QSCRIPT_SOURCES} ${QSCRIPT_HEADERS})
katie_setup_paths()
add_executable(qscript ${qscript_SOURCES})
target_link_libraries(qscript ${EXTRA_QTSCRIPT_LIBS})
@ -30,12 +29,12 @@ target_link_libraries(qscript ${EXTRA_QTSCRIPT_LIBS})
install(
TARGETS qscript
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES
${CMAKE_CURRENT_SOURCE_DIR}/qscript.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

8
src/tools/qtconfig/CMakeLists.txt
View file

@ -38,10 +38,8 @@ configure_file(
)
katie_setup_target(qtconfig ${QTCONFIG_SOURCES} ${QTCONFIG_HEADERS})
katie_setup_paths()
add_executable(qtconfig
WIN32 # TODO: MACOSX_BUNDLE
${qtconfig_SOURCES}
)
target_link_libraries(qtconfig ${EXTRA_QTCONFIG_LIBS})
@ -49,17 +47,17 @@ target_link_libraries(qtconfig ${EXTRA_QTCONFIG_LIBS})
install(
TARGETS qtconfig
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/qtconfig.desktop
DESTINATION ${APPLICATIONS_INSTALL_PATH}
DESTINATION ${KATIE_APPLICATIONS_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/qtconfig.png
DESTINATION ${PIXMAPS_INSTALL_PATH}
DESTINATION ${KATIE_PIXMAPS_RELATIVE}
COMPONENT Devel
)

4
src/tools/qtconfig/qtconfig.desktop.cmake
View file

@ -1,8 +1,8 @@
[Desktop Entry]
Name=Katie Config
Comment=Configure Katie behavior, styles, fonts
Exec=@QT_BINARIES_PATH@/qtconfig
Icon=@PIXMAPS_INSTALL_PATH@/qtconfig.png
Exec=@KATIE_BINARIES_FULL@/qtconfig@CMAKE_EXECUTABLE_SUFFIX@
Icon=@KATIE_PIXMAPS_FULL@/qtconfig.png
Terminal=false
Encoding=UTF-8
Type=Application

5
src/tools/rcc/CMakeLists.txt
View file

@ -22,7 +22,6 @@ set(RCC_HEADERS
)
katie_setup_target(rcc ${RCC_SOURCES} ${RCC_HEADERS})
katie_setup_paths()
add_executable(rcc ${rcc_SOURCES})
target_link_libraries(rcc ${EXTRA_RCC_LIBS})
@ -30,11 +29,11 @@ target_link_libraries(rcc ${EXTRA_RCC_LIBS})
install(
TARGETS rcc
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/rcc.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

5
src/tools/uic/CMakeLists.txt
View file

@ -28,7 +28,6 @@ set(UIC_SOURCES
)
katie_setup_target(uic ${UIC_SOURCES})
katie_setup_paths()
add_executable(uic ${uic_SOURCES})
target_link_libraries(uic ${EXTRA_UIC_LIBS})
@ -36,11 +35,11 @@ target_link_libraries(uic ${EXTRA_UIC_LIBS})
install(
TARGETS uic
EXPORT KatieBinaryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
RUNTIME DESTINATION ${QT_BINARIES_PATH}
RUNTIME DESTINATION ${KATIE_BINARIES_RELATIVE}
COMPONENT Devel
)
install(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/uic.1
DESTINATION ${MAN_INSTALL_PATH}/man1
DESTINATION ${KATIE_MAN_RELATIVE}/man1
)

7
src/uitools/CMakeLists.txt
View file

@ -57,7 +57,6 @@ katie_generate_misc("${UITOOLS_HEADERS}" QtUiTools)
katie_generate_public("${UITOOLS_PUBLIC_HEADERS}" QtUiTools)
katie_generate_package(KtUiTools "KtCore KtGui KtXml KtScript")
katie_setup_target(KtUiTools ${UITOOLS_SOURCES} ${UITOOLS_HEADERS})
katie_setup_paths()
add_library(KtUiTools ${KATIE_TYPE} ${KtUiTools_SOURCES})
target_link_libraries(KtUiTools ${EXTRA_UITOOLS_LIBS})
@ -70,13 +69,13 @@ set_target_properties(KtUiTools PROPERTIES
install(
TARGETS KtUiTools
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtUiTools
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtUiTools)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtUiTools)

7
src/xml/CMakeLists.txt
View file

@ -61,7 +61,6 @@ katie_generate_misc("${XML_HEADERS}" QtXml)
katie_generate_public("${XML_PUBLIC_HEADERS}" QtXml)
katie_generate_package(KtXml "KtCore")
katie_setup_target(KtXml ${XML_SOURCES} ${XML_HEADERS})
katie_setup_paths()
add_library(KtXml ${KATIE_TYPE} ${KtXml_SOURCES})
target_link_libraries(KtXml ${EXTRA_XML_LIBS})
@ -74,13 +73,13 @@ set_target_properties(KtXml PROPERTIES
install(
TARGETS KtXml
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtXml
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtXml)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtXml)

7
src/xmlpatterns/CMakeLists.txt
View file

@ -76,7 +76,6 @@ katie_generate_misc("${XMLPATTERNS_HEADERS}" QtXmlPatterns)
katie_generate_public("${XMLPATTERNS_PUBLIC_HEADERS}" QtXmlPatterns)
katie_generate_package(KtXmlPatterns "KtCore KtNetwork")
katie_setup_target(KtXmlPatterns ${XMLPATTERNS_SOURCES} ${XMLPATTERNS_HEADERS})
katie_setup_paths()
# the component requires exceptions
set_source_files_properties(${XMLPATTERNS_SOURCES} PROPERTIES COMPILE_FLAGS "-fexceptions")
@ -92,13 +91,13 @@ set_target_properties(KtXmlPatterns PROPERTIES
install(
TARGETS KtXmlPatterns
EXPORT KatieLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}
DESTINATION ${QT_LIBRARIES_PATH}
DESTINATION ${KATIE_LIBRARIES_RELATIVE}
)
install(
DIRECTORY ${CMAKE_BINARY_DIR}/include/QtXmlPatterns
DESTINATION ${QT_HEADERS_PATH}
DESTINATION ${KATIE_HEADERS_RELATIVE}
COMPONENT Devel
)
katie_optimize_headers(${QT_HEADERS_PATH}/QtXmlPatterns)
katie_optimize_headers(${KATIE_HEADERS_FULL}/QtXmlPatterns)