diff options
| -rw-r--r-- | Source/CMakeLists.txt | 36 | ||||
| -rw-r--r-- | Source/CPack/cmCPackConfigure.h.in | 3 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGeneratorFactory.cxx | 4 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGeneratorFactory.h | 2 |
4 files changed, 26 insertions, 19 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index de3ce15..2cf4d1c 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -62,7 +62,6 @@ endif() # configure the .h file configure_file(cmConfigure.cmake.h.in cmConfigure.h) configure_file(cmVersionConfig.h.in cmVersionConfig.h) -configure_file(CPack/cmCPackConfigure.h.in CPack/cmCPackConfigure.h) # Tell CMake executable in the build tree where to find the source tree. configure_file( @@ -1041,18 +1040,14 @@ add_library( CPack/IFW/cmCPackIFWRepository.cxx CPack/IFW/cmCPackIFWRepository.h ) -target_include_directories(CPackLib PUBLIC "${CMake_SOURCE_DIR}/Source/CPack") +target_include_directories( + CPackLib + PUBLIC + "${CMAKE_CURRENT_SOURCE_DIR}/CPack" + "${CMAKE_CURRENT_BINARY_DIR}/CPack" + ) target_link_libraries(CPackLib PUBLIC CMakeLib) -if(CYGWIN) - target_sources( - CPackLib - PUBLIC - CPack/cmCPackCygwinBinaryGenerator.cxx - CPack/cmCPackCygwinSourceGenerator.cxx - ) -endif() - option(CPACK_ENABLE_FREEBSD_PKG "Add FreeBSD pkg(8) generator to CPack." OFF) if(UNIX) @@ -1089,9 +1084,17 @@ if(UNIX) endif() if(CYGWIN) + target_sources( + CPackLib + PUBLIC + CPack/cmCPackCygwinBinaryGenerator.cxx + CPack/cmCPackCygwinSourceGenerator.cxx + ) find_package(LibUUID) endif() -if(WIN32 OR (CYGWIN AND LibUUID_FOUND)) + +if(WIN32 OR (CYGWIN AND TARGET LibUUID::LibUUID)) + set(ENABLE_BUILD_WIX_GENERATOR 1) target_sources( CPackLib PUBLIC @@ -1118,6 +1121,7 @@ if(WIN32 OR (CYGWIN AND LibUUID_FOUND)) CPack/WiX/cmWIXSourceWriter.cxx CPack/WiX/cmWIXSourceWriter.h ) + target_link_libraries(CPackLib PUBLIC $<TARGET_NAME_IF_EXISTS:LibUUID::LibUUID>) endif() if(APPLE) @@ -1147,16 +1151,14 @@ if(APPLE) "See CMakeFiles/CMakeError.log for details of the failure.") endif() endif() -if(CYGWIN AND LibUUID_FOUND) - target_include_directories(CPackLib PUBLIC ${LibUUID_INCLUDE_DIRS}) - target_link_libraries(CPackLib PUBLIC ${LibUUID_LIBRARIES}) - set_property(SOURCE CPack/cmCPackGeneratorFactory.cxx PROPERTY COMPILE_DEFINITIONS HAVE_LIBUUID) -endif() if(CPACK_ENABLE_FREEBSD_PKG AND FREEBSD_PKG_INCLUDE_DIRS AND FREEBSD_PKG_LIBRARIES) target_include_directories(CPackLib PUBLIC ${FREEBSD_PKG_INCLUDE_DIRS}) target_link_libraries(CPackLib PUBLIC ${FREEBSD_PKG_LIBRARIES}) target_compile_definitions(CPackLib PUBLIC HAVE_FREEBSD_PKG) endif() +# Render config header file for CPackLib +configure_file(CPack/cmCPackConfigure.h.in CPack/cmCPackConfigure.h) + # Build CMake executable add_executable(cmake cmakemain.cxx cmcmd.cxx cmcmd.h) diff --git a/Source/CPack/cmCPackConfigure.h.in b/Source/CPack/cmCPackConfigure.h.in index 8ac1661..128784a 100644 --- a/Source/CPack/cmCPackConfigure.h.in +++ b/Source/CPack/cmCPackConfigure.h.in @@ -1,2 +1,5 @@ /* Distributed under the OSI-approved BSD 3-Clause License. See accompanying file Copyright.txt or https://cmake.org/licensing for details. */ +#pragma once + +#cmakedefine01 ENABLE_BUILD_WIX_GENERATOR diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 725ea8a..ef58870 100644 --- a/Source/CPack/cmCPackGeneratorFactory.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -34,7 +34,7 @@ # include "cmCPackRPMGenerator.h" #endif -#if defined(_WIN32) || (defined(__CYGWIN__) && defined(HAVE_LIBUUID)) +#if ENABLE_BUILD_WIX_GENERATOR # include "WiX/cmCPackWIXGenerator.h" #endif @@ -80,7 +80,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() cmCPackCygwinSourceGenerator::CreateGenerator); } #endif -#if defined(_WIN32) || (defined(__CYGWIN__) && defined(HAVE_LIBUUID)) +#if ENABLE_BUILD_WIX_GENERATOR if (cmCPackWIXGenerator::CanGenerate()) { this->RegisterGenerator("WIX", "MSI file format via WiX tools", cmCPackWIXGenerator::CreateGenerator); diff --git a/Source/CPack/cmCPackGeneratorFactory.h b/Source/CPack/cmCPackGeneratorFactory.h index f3e25a6..52c1b5c 100644 --- a/Source/CPack/cmCPackGeneratorFactory.h +++ b/Source/CPack/cmCPackGeneratorFactory.h @@ -8,6 +8,8 @@ #include <memory> #include <string> +#include "cmCPackConfigure.h" // IWYU pragma: keep + class cmCPackGenerator; class cmCPackLog; |