Allow building the tests directory as a standalone CMake project
At the moment, Coin builds tests as a separate qmake invocation against an installed Qt. We need to support the same with CMake. Change the tests subdirectory to be a standalone CMake project when CMake does not detect an existing QtTest target while processing the subdirectory. If the target exists, it means we are building the whole repo, if the target does not exist, we need to call find_package to find the installed Qt. Refactor and move around a few things to make standalone tests build successfully: - add a new macro to set up paths to find QtSetup - add a new macro to find all macOS frameworks - add a new macro to set up building tests - add a new macro that actually builds the tests - export the INSTALL_CMAKE_NAMESPACE value into the BuildInternals Config file - export the CMAKE_BUILD_TYPE value, because a test project doesn't have a .git subdir and thus defaults to be built in Release mode, even though qtbase might have been built in Debug, so to avoid the mixing, the propagate the build type - stop overriding INSTALL_CMAKE_NAMESPACE and QT_CMAKE_EXPORT_NAMESPACE inside QtSetup if they are set, because the tests project doesn't specify a major version, and if we override the values, the moc / uic targets don't get the correct major version prefix and configuration fails Change-Id: Ibdb03687302567fe325a15f6d1cb922c76240675 Fixes: QTBUG-75090 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Alexandru Croitor
parent
774088b677
commit
c7fd10a022
@ -36,9 +36,17 @@ set(INSTALL_SYSCONFDIR "etc/xdg" CACHE PATH
|
||||
set(INSTALL_EXAMPLESDIR "examples" CACHE PATH "Examples [PREFIX/examples]")
|
||||
set(INSTALL_TESTSDIR "tests" CACHE PATH "Tests [PREFIX/tests]")
|
||||
|
||||
set(INSTALL_CMAKE_NAMESPACE "Qt${PROJECT_VERSION_MAJOR}" CACHE STRING "CMake namespace [Qt${PROJECT_VERSION_MAJOR}]")
|
||||
# The variables might have already been set in QtBuildInternalsExtra.cmake if the file is included
|
||||
# while building a new module and not QtBase. In that case, stop overriding the value.
|
||||
if(NOT INSTALL_CMAKE_NAMESPACE)
|
||||
set(INSTALL_CMAKE_NAMESPACE "Qt${PROJECT_VERSION_MAJOR}"
|
||||
CACHE STRING "CMake namespace [Qt${PROJECT_VERSION_MAJOR}]")
|
||||
endif()
|
||||
if(NOT QT_CMAKE_EXPORT_NAMESPACE)
|
||||
set(QT_CMAKE_EXPORT_NAMESPACE "Qt${PROJECT_VERSION_MAJOR}"
|
||||
CACHE STRING "CMake namespace used when exporting targets [Qt${PROJECT_VERSION_MAJOR}]")
|
||||
endif()
|
||||
|
||||
set(QT_CMAKE_EXPORT_NAMESPACE "Qt${PROJECT_VERSION_MAJOR}" CACHE STRING "CMake namespace used when exporting targets [Qt${PROJECT_VERSION_MAJOR}]")
|
||||
set(QT_CMAKE_DIR "${CMAKE_CURRENT_LIST_DIR}")
|
||||
|
||||
# the default RPATH to be used when installing, but only if it's not a system directory
|
||||
@ -1837,3 +1845,26 @@ function(qt_install_3rdparty_library target)
|
||||
qt_install_3rdparty_config_files(${target} EXPORT ${target} ${ARGN})
|
||||
endfunction()
|
||||
|
||||
macro(qt_find_apple_system_frameworks)
|
||||
if(APPLE)
|
||||
find_library(FWAppKit AppKit)
|
||||
find_library(FWApplicationServices ApplicationServices)
|
||||
find_library(FWCarbon Carbon)
|
||||
find_library(FWCoreFoundation CoreFoundation)
|
||||
find_library(FWCoreServices CoreServices)
|
||||
find_library(FWCoreVideo CoreVideo)
|
||||
find_library(FWcups cups)
|
||||
find_library(FWDiskArbitration DiskArbitration)
|
||||
find_library(FWFoundation Foundation)
|
||||
find_library(FWIOKit IOKit)
|
||||
find_library(FWIOSurface IOSurface)
|
||||
find_library(FWImageIO ImageIO)
|
||||
find_library(FWMetal Metal)
|
||||
find_library(FWMobileCoreServices MobileCoreServices)
|
||||
find_library(FWQuartzCore QuartzCore)
|
||||
find_library(FWSecurity Security)
|
||||
find_library(FWSystemConfiguration SystemConfiguration)
|
||||
find_library(FWUIKit UIKit)
|
||||
find_library(FWWatchKit WatchKit)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
@ -12,18 +12,22 @@ if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake")
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake)
|
||||
endif()
|
||||
|
||||
macro(qt_set_up_build_internals_paths)
|
||||
# Set up the paths for the modules.
|
||||
set(QT_CMAKE_MODULE_PATH "${QT_BUILD_INTERNALS_PATH}/../${QT_CMAKE_EXPORT_NAMESPACE}")
|
||||
list(APPEND CMAKE_MODULE_PATH ${QT_CMAKE_MODULE_PATH})
|
||||
|
||||
# If the repo has its own cmake modules, include those in the module path.
|
||||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
macro(qt_build_repo_begin)
|
||||
if(${ARGC} EQUAL 1 AND "${ARGV0}" STREQUAL "SKIP_CMAKE_MODULE_PATH_ADDITION")
|
||||
# No-op.
|
||||
else()
|
||||
# Set up the paths for the modules.
|
||||
set(QT_CMAKE_MODULE_PATH "${QT_BUILD_INTERNALS_PATH}/../${QT_CMAKE_EXPORT_NAMESPACE}")
|
||||
list(APPEND CMAKE_MODULE_PATH ${QT_CMAKE_MODULE_PATH})
|
||||
|
||||
# If the repo has its own cmake modules, include those in the module path.
|
||||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
endif()
|
||||
qt_set_up_build_internals_paths()
|
||||
endif()
|
||||
|
||||
# Qt specific setup common for all modules:
|
||||
@ -73,3 +77,18 @@ macro(qt_build_repo)
|
||||
|
||||
qt_build_repo_end()
|
||||
endmacro()
|
||||
|
||||
macro(qt_set_up_standalone_tests_build)
|
||||
qt_set_up_build_internals_paths()
|
||||
include(QtSetup)
|
||||
qt_find_apple_system_frameworks()
|
||||
endmacro()
|
||||
|
||||
macro(qt_build_tests)
|
||||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/auto/CMakeLists.txt")
|
||||
add_subdirectory(auto)
|
||||
endif()
|
||||
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/benchmarks/CMakeLists.txt")
|
||||
add_subdirectory(benchmarks)
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
@ -174,6 +174,10 @@ option(BUILD_SHARED_LIBS \"Build Qt statically or dynamically\" ${BUILD_SHARED_L
|
||||
string(APPEND QT_BUILD_INTERNALS_EXTRA_CMAKE_CODE "
|
||||
set(QT_CMAKE_EXPORT_NAMESPACE ${QT_CMAKE_EXPORT_NAMESPACE})")
|
||||
string(APPEND QT_BUILD_INTERNALS_EXTRA_CMAKE_CODE "
|
||||
set(INSTALL_CMAKE_NAMESPACE ${INSTALL_CMAKE_NAMESPACE})")
|
||||
string(APPEND QT_BUILD_INTERNALS_EXTRA_CMAKE_CODE "
|
||||
set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE})")
|
||||
string(APPEND QT_BUILD_INTERNALS_EXTRA_CMAKE_CODE "
|
||||
set(QT_BUILD_INTERNALS_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")")
|
||||
|
||||
# Propagate the original install prefix, so that a developer building a child module can
|
||||
|
||||
@ -8,9 +8,7 @@ qt_copy_or_install(DIRECTORY "${PROJECT_SOURCE_DIR}/mkspecs"
|
||||
DESTINATION ${mkspecs_install_dir})
|
||||
# special case end
|
||||
|
||||
find_library(FWApplicationServices ApplicationServices) # special case
|
||||
find_library(FWCoreServices CoreServices) # special case
|
||||
find_library(FWFoundation Foundation) # special case
|
||||
qt_find_apple_system_frameworks() # special case
|
||||
|
||||
#####################################################################
|
||||
## qmake Binary:
|
||||
|
||||
@ -1,24 +1,4 @@
|
||||
if(APPLE)
|
||||
find_library(FWAppKit AppKit)
|
||||
find_library(FWApplicationServices ApplicationServices)
|
||||
find_library(FWCarbon Carbon)
|
||||
find_library(FWCoreFoundation CoreFoundation)
|
||||
find_library(FWCoreServices CoreServices)
|
||||
find_library(FWCoreVideo CoreVideo)
|
||||
find_library(FWcups cups)
|
||||
find_library(FWDiskArbitration DiskArbitration)
|
||||
find_library(FWFoundation Foundation)
|
||||
find_library(FWIOKit IOKit)
|
||||
find_library(FWIOSurface IOSurface)
|
||||
find_library(FWImageIO ImageIO)
|
||||
find_library(FWMetal Metal)
|
||||
find_library(FWMobileCoreServices MobileCoreServices)
|
||||
find_library(FWQuartzCore QuartzCore)
|
||||
find_library(FWSecurity Security)
|
||||
find_library(FWSystemConfiguration SystemConfiguration)
|
||||
find_library(FWUIKit UIKit)
|
||||
find_library(FWWatchKit WatchKit)
|
||||
endif()
|
||||
qt_find_apple_system_frameworks()
|
||||
|
||||
add_subdirectory(3rdparty)
|
||||
|
||||
|
||||
@ -1 +1,16 @@
|
||||
add_subdirectory(auto)
|
||||
# special case begin
|
||||
if(NOT TARGET Qt::Test)
|
||||
cmake_minimum_required(VERSION 3.14.0)
|
||||
project(QtBaseTests C CXX ASM)
|
||||
find_package(Qt5 REQUIRED COMPONENTS BuildInternals Core Test)
|
||||
find_package(Qt5 COMPONENTS DBus Gui OpenGL Widgets Xml)
|
||||
qt_set_up_standalone_tests_build()
|
||||
|
||||
# Find a few packages that are usually found in configure.cmake,
|
||||
# because a few tests link directly against those libraries.
|
||||
qt_find_package(WrapDBus1 PROVIDED_TARGETS dbus-1)
|
||||
qt_find_package(WrapOpenGL PROVIDED_TARGETS WrapOpenGL)
|
||||
endif()
|
||||
# special case end
|
||||
|
||||
qt_build_tests()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user