diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-10-06 17:57:24 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-10-06 17:57:24 +0300 |
| commit | b8dcd691aea2b40f6b29f15f3600dbbbca034a57 (patch) | |
| tree | 3fcc1c2388fcc0d136cec8216f18f61a5941b492 /cmake | |
| parent | e52cc883d48207aa3e1e52ca22072bcda2f4ee6d (diff) | |
Fix UB in status code config of LLFIO, whereby there was a cast to an object of incorrect dynamic type.
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QuickCppLibBootstrap.cmake | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/cmake/QuickCppLibBootstrap.cmake b/cmake/QuickCppLibBootstrap.cmake index 8efa0b26..0094ad4f 100644 --- a/cmake/QuickCppLibBootstrap.cmake +++ b/cmake/QuickCppLibBootstrap.cmake @@ -31,11 +31,18 @@ endforeach() if(DEFINED quickcpplib_DIR) find_package(quickcpplib QUIET CONFIG) if(quickcpplib_FOUND) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${quickcpplib_DIR}/cmakelib") - set(CTEST_QUICKCPPLIB_SCRIPTS "${quickcpplib_DIR}/scripts") - set(quickcpplib_done ON) + if(EXISTS "${quickcpplib_DIR}/share/cmakelib") + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${quickcpplib_DIR}/share/cmakelib") + set(CTEST_QUICKCPPLIB_SCRIPTS "${quickcpplib_DIR}/share/scripts") + set(quickcpplib_done ON) + elseif(EXISTS "${quickcpplib_DIR}/../../../share/cmakelib") + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${quickcpplib_DIR}/../../../share/cmakelib") + set(CTEST_QUICKCPPLIB_SCRIPTS "${quickcpplib_DIR}/../../../share/scripts") + set(quickcpplib_done ON) + endif() endif() endif() +#message("*** ${CMAKE_MODULE_PATH}") if(NOT quickcpplib_done) # CMAKE_SOURCE_DIR is the very topmost parent cmake project # CMAKE_CURRENT_SOURCE_DIR is the current cmake subproject @@ -58,11 +65,6 @@ if(NOT quickcpplib_done) if(CTEST_QUICKCPPLIB_CLONE_DIR) if(NOT EXISTS "${CTEST_QUICKCPPLIB_CLONE_DIR}/repo/cmakelib") file(MAKE_DIRECTORY "${CTEST_QUICKCPPLIB_CLONE_DIR}") - find_package(quickcpplib QUIET CONFIG PATHS "${CTEST_QUICKCPPLIB_CLONE_DIR}/repo") - if(quickcpplib_FOUND) - endif() - endif() - if(NOT EXISTS "${CTEST_QUICKCPPLIB_CLONE_DIR}/repo/cmakelib") message(STATUS "quickcpplib not found, cloning git repository and installing into ${CTEST_QUICKCPPLIB_CLONE_DIR} ...") include(FindGit) execute_process(COMMAND "${GIT_EXECUTABLE}" clone --recurse-submodules --depth 1 --jobs 8 --shallow-submodules "https://github.com/ned14/quickcpplib.git" repo |