From 933bd017f106221685e5dcb9c9691ded3b0c4d8b Mon Sep 17 00:00:00 2001 From: Robin Sommer Date: Thu, 18 May 2023 10:38:29 +0200 Subject: [PATCH] Fix CMake ordering issue leaving configuration paths unset. --- CMakeLists.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b918db39b..1c3fa86af0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1108,19 +1108,6 @@ if (NOT BINARY_PACKAGING_MODE) set(ZEEK_DIST ${PROJECT_SOURCE_DIR}) endif () -string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-version.h.in - ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h DESTINATION include/zeek) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in - ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/zeek) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config-paths.h.in - ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h DESTINATION include/zeek) - include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) execute_process(COMMAND "${CMAKE_COMMAND}" -E create_symlink "." "${CMAKE_CURRENT_BINARY_DIR}/zeek") @@ -1275,6 +1262,19 @@ configure_file(${CMAKE_SOURCE_DIR}/spicy-path.in ${CMAKE_BINARY_DIR}/spicy-path configure_file(${CMAKE_SOURCE_DIR}/hilti-cxx-include-dirs.in ${CMAKE_BINARY_DIR}/hilti-cxx-include-dirs @ONLY) +string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LOWER) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-version.h.in + ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-version.h DESTINATION include/zeek) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config.h DESTINATION include/zeek) + +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zeek-config-paths.h.in + ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/zeek-config-paths.h DESTINATION include/zeek) + # ############################################################################## # Packaging Setup