From 2bf123b814a997c70f4561b3513e302d85932f24 Mon Sep 17 00:00:00 2001 From: Matthieu Longo Date: Mon, 9 Apr 2018 11:33:57 +0200 Subject: [PATCH 1/2] build fails if CMAKE_MODULE_PATH is not empty, use CMAKE_SOURCE_DIR instead --- tools/cmake/Modules/WindowsC99CheckDef.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/cmake/Modules/WindowsC99CheckDef.cmake b/tools/cmake/Modules/WindowsC99CheckDef.cmake index f1ecc88479..95c567f93a 100644 --- a/tools/cmake/Modules/WindowsC99CheckDef.cmake +++ b/tools/cmake/Modules/WindowsC99CheckDef.cmake @@ -30,5 +30,6 @@ add_custom_command( TARGET qpid-proton PRE_LINK COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_MODULE_PATH}/WindowsC99SymbolCheck.py $ + ${CMAKE_SOURCE_DIR}/tools/cmake/Modules/WindowsC99SymbolCheck.py + $ COMMENT "Checking for dangerous use of C99-violating functions") From 6376e260ec50dc1762f2443ff4147d18b0439ea9 Mon Sep 17 00:00:00 2001 From: Jiri Danek Date: Sat, 16 May 2020 12:59:34 +0200 Subject: [PATCH 2/2] PROTON-2215: Use CMAKE_CURRENT_LIST_DIR in a relative path The previously used CMAKE_MODULE_PATH is actually a list of directories, and therefore should not be used here. --- tools/cmake/Modules/WindowsC99CheckDef.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cmake/Modules/WindowsC99CheckDef.cmake b/tools/cmake/Modules/WindowsC99CheckDef.cmake index 95c567f93a..6375c3b286 100644 --- a/tools/cmake/Modules/WindowsC99CheckDef.cmake +++ b/tools/cmake/Modules/WindowsC99CheckDef.cmake @@ -30,6 +30,6 @@ add_custom_command( TARGET qpid-proton PRE_LINK COMMAND ${PYTHON_EXECUTABLE} - ${CMAKE_SOURCE_DIR}/tools/cmake/Modules/WindowsC99SymbolCheck.py + ${CMAKE_CURRENT_LIST_DIR}/WindowsC99SymbolCheck.py $ COMMENT "Checking for dangerous use of C99-violating functions")