From fba880eb0254a42916dfc9dca0c70e340ba4d90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 16 Aug 2019 23:16:53 +0200 Subject: [PATCH] Squashed 'cmake/cable/' changes from 945b7e5..3fb12ab 3fb12ab Cable 0.4.4 680296e Fix Cable modules not being in CMAKE_MODULE_PATH git-subtree-dir: cmake/cable git-subtree-split: 3fb12ab54d42ecebeedd399f9146f88b1f8fdcbc --- bootstrap.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap.cmake b/bootstrap.cmake index 162a38a..39ec92a 100644 --- a/bootstrap.cmake +++ b/bootstrap.cmake @@ -10,7 +10,7 @@ # # This is internal variable automatically updated with external tools. # Use CABLE_VERSION variable if you need this information. -set(version 0.4.3) +set(version 0.4.4) # For convenience, add the project CMake module dir to module path. set(module_dir ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -18,6 +18,9 @@ if(EXISTS ${module_dir}) list(APPEND CMAKE_MODULE_PATH ${module_dir}) endif() +# Always add this Cable instance modules to the CMake module path. +list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) + if(CABLE_VERSION) # Some other instance of Cable has been initialized in the top project. @@ -61,9 +64,6 @@ set(CABLE_VERSION ${version}) # Mark this project as non-nested. set(PROJECT_IS_NESTED FALSE) -# Add Cable modules to the CMake module path. -list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}) - cable_log("Cable ${CABLE_VERSION} initialized") cable_debug("Project CMake modules directory: ${module_dir}")