mirror of https://github.com/cutefishos/calamares
Merge branch 'issue-1428'
Install all the relevant CMake, libcalamares and libcalamaresui files -- config and headers -- so that external modules can be created (again). This support had severely bitrotted, so that the only effective way to add modules was to do so inside the Calamares build tree. Now it's independent again. FIXES #1428main
Adriaan de Groot
5 years ago
commit
6c40d69574
@ -1,4 +0,0 @@
|
|||||||
set(CALAMARES_INCLUDE_DIRS
|
|
||||||
"@PROJECT_SOURCE_DIR@/src/libcalamares"
|
|
||||||
"@PROJECT_BINARY_DIR@/src/libcalamares"
|
|
||||||
)
|
|
||||||
@ -1,32 +1,78 @@
|
|||||||
# Config file for the Calamares package
|
# Config file for the Calamares package
|
||||||
#
|
#
|
||||||
# It defines the following variables
|
# The following IMPORTED targets are defined:
|
||||||
# CALAMARES_INCLUDE_DIRS - include directories for Calamares
|
# - Calamares::calamares - the core library
|
||||||
# CALAMARES_LIBRARIES - libraries to link against
|
# - Calamares::calamaresui - the UI (and QML) library
|
||||||
# CALAMARES_USE_FILE - name of a convenience include
|
#
|
||||||
# CALAMARES_APPLICATION_NAME - human-readable application name
|
# For legacy use it defines the following variables:
|
||||||
|
# - Calamares_INCLUDE_DIRS - include directories for Calamares
|
||||||
|
# - Calamares_LIB_DIRS - library directories
|
||||||
|
# - Calamares_LIBRARIES - libraries to link against
|
||||||
|
|
||||||
|
@PACKAGE_INIT@
|
||||||
|
|
||||||
|
### Versioning and IMPORTED targets
|
||||||
#
|
#
|
||||||
# Typical use is:
|
|
||||||
#
|
#
|
||||||
# find_package(Calamares REQUIRED)
|
include(${CMAKE_CURRENT_LIST_DIR}/CalamaresConfigVersion.cmake)
|
||||||
# include("${CALAMARES_USE_FILE}")
|
include(${CMAKE_CURRENT_LIST_DIR}/CalamaresTargets.cmake)
|
||||||
|
|
||||||
|
### Dependencies
|
||||||
|
#
|
||||||
|
# The libraries can depend on a variety of Qt and KDE Frameworks
|
||||||
|
# components, so accumulate them and find (just once).
|
||||||
#
|
#
|
||||||
|
macro(accumulate_deps outvar target namespace)
|
||||||
|
string(LENGTH ${namespace} _nslen)
|
||||||
|
get_target_property(_libs ${target} INTERFACE_LINK_LIBRARIES)
|
||||||
|
foreach(_lib ${_libs})
|
||||||
|
if (_lib MATCHES ^${namespace})
|
||||||
|
string(SUBSTRING ${_lib} ${_nslen} -1 _component)
|
||||||
|
list(APPEND ${outvar} ${_component})
|
||||||
|
endif()
|
||||||
|
endforeach()
|
||||||
|
endmacro()
|
||||||
|
|
||||||
|
# Qt5 infrastructure for translations is required
|
||||||
|
set(qt5_required Core Widgets LinguistTools)
|
||||||
|
accumulate_deps(qt5_required Calamares::calamares Qt5::)
|
||||||
|
accumulate_deps(qt5_required Calamares::calamaresui Qt5::)
|
||||||
|
find_package(Qt5 CONFIG REQUIRED ${qt5_required})
|
||||||
|
|
||||||
# Compute paths
|
set(kf5_required "")
|
||||||
get_filename_component(CALAMARES_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
|
accumulate_deps(kf5_required Calamares::calamares KF5::)
|
||||||
if(EXISTS "${CALAMARES_CMAKE_DIR}/CMakeCache.txt")
|
accumulate_deps(kf5_required Calamares::calamaresui KF5::)
|
||||||
# In build tree
|
if(kf5_required)
|
||||||
include("${CALAMARES_CMAKE_DIR}/CalamaresBuildTreeSettings.cmake")
|
find_package(ECM ${ECM_VERSION} NO_MODULE)
|
||||||
else()
|
if( ECM_FOUND )
|
||||||
set(CALAMARES_INCLUDE_DIRS "${CALAMARES_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@/libcalamares")
|
list(PREPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
|
||||||
|
find_package(KF5 REQUIRED COMPONENTS ${kf5_required})
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Our library dependencies (contains definitions for IMPORTED targets)
|
### Legacy support
|
||||||
include("${CALAMARES_CMAKE_DIR}/CalamaresLibraryDepends.cmake")
|
#
|
||||||
|
#
|
||||||
|
set(Calamares_LIB_DIRS "@PACKAGE_CMAKE_INSTALL_LIBDIR@")
|
||||||
|
set(Calamares_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
|
||||||
|
set(Calamares_LIBRARIES Calamares::calamares)
|
||||||
|
|
||||||
|
### CMake support
|
||||||
|
#
|
||||||
|
#
|
||||||
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
|
||||||
|
|
||||||
# These are IMPORTED targets created by CalamaresLibraryDepends.cmake
|
include(CalamaresAddBrandingSubdirectory)
|
||||||
set(CALAMARES_LIBRARIES calamares)
|
include(CalamaresAddLibrary)
|
||||||
|
include(CalamaresAddModuleSubdirectory)
|
||||||
|
include(CalamaresAddPlugin)
|
||||||
|
|
||||||
# Convenience variables
|
# These are feature-settings that affect consumers of Calamares
|
||||||
set(CALAMARES_USE_FILE "${CALAMARES_CMAKE_DIR}/CalamaresUse.cmake")
|
# libraries as well; without Python-support in the libs, for instance,
|
||||||
set(CALAMARES_APPLICATION_NAME "Calamares")
|
# there's no point in having a Python plugin.
|
||||||
|
#
|
||||||
|
# This list should match the one in libcalamares/CalamaresConfig.h,
|
||||||
|
# which is the C++-language side of the same configuration.
|
||||||
|
set(Calamares_WITH_PYTHON @WITH_PYTHON@)
|
||||||
|
set(Calamares_WITH_PYTHONQT @WITH_PYTHONQT@)
|
||||||
|
set(Calamares_WITH_QML @WITH_QML@)
|
||||||
|
|||||||
@ -1,12 +0,0 @@
|
|||||||
set(PACKAGE_VERSION "@CALAMARES_VERSION@")
|
|
||||||
|
|
||||||
# Check whether the requested PACKAGE_FIND_VERSION is compatible
|
|
||||||
if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
|
|
||||||
set(PACKAGE_VERSION_COMPATIBLE FALSE)
|
|
||||||
else()
|
|
||||||
set(PACKAGE_VERSION_COMPATIBLE TRUE)
|
|
||||||
if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
|
|
||||||
set(PACKAGE_VERSION_EXACT TRUE)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
@ -1,29 +0,0 @@
|
|||||||
# A setup-cmake-things-for-Calamares module.
|
|
||||||
#
|
|
||||||
# This module handles looking for dependencies and including
|
|
||||||
# all of the Calamares macro modules, so that you can focus
|
|
||||||
# on just using the macros to build Calamares modules.
|
|
||||||
# Typical use looks like this:
|
|
||||||
#
|
|
||||||
# ```
|
|
||||||
# find_package( Calamares REQUIRED )
|
|
||||||
# include( "${CALAMARES_CMAKE_DIR}/CalamaresUse.cmake" )
|
|
||||||
# ```
|
|
||||||
#
|
|
||||||
# The first CMake command finds Calamares (which will contain
|
|
||||||
# this file), then adds the found location to the search path,
|
|
||||||
# and then includes this file. After that, you can use
|
|
||||||
# Calamares module and plugin macros.
|
|
||||||
|
|
||||||
if( NOT CALAMARES_CMAKE_DIR )
|
|
||||||
message( FATAL_ERROR "Use find_package(Calamares) first." )
|
|
||||||
endif()
|
|
||||||
set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CALAMARES_CMAKE_DIR} )
|
|
||||||
|
|
||||||
find_package( Qt5 @QT_VERSION@ CONFIG REQUIRED Core Widgets LinguistTools )
|
|
||||||
|
|
||||||
include( CalamaresAddLibrary )
|
|
||||||
include( CalamaresAddModuleSubdirectory )
|
|
||||||
include( CalamaresAddPlugin )
|
|
||||||
include( CalamaresAddBrandingSubdirectory )
|
|
||||||
|
|
||||||
Loading…
Reference in New Issue