This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/main by this push:
new 001195c05 PROTON-2786: Don't reuse possibly incorrect
`CMAKE_CXX_COMPILER` value determined by `check_language(CXX)` (#415)
001195c05 is described below
commit 001195c05a5fa1ec3d3b14a4963b82556450819f
Author: Jiri Daněk <jda...@redhat.com>
AuthorDate: Fri Dec 22 17:53:55 2023 +0100
PROTON-2786: Don't reuse possibly incorrect `CMAKE_CXX_COMPILER` value
determined by `check_language(CXX)` (#415)
---
CMakeLists.txt | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0f7ebda5..2b56ea024 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -73,9 +73,12 @@ set (C_EXTENDED_FLAGS ${C_EXTENDED_${CMAKE_C_COMPILER_ID}})
## C++
check_language (CXX)
if (CMAKE_CXX_COMPILER)
+ # check_language(CXX) does not handle compiler parameters in CXX env
variable well
+ # forget the result of the check and let enable_language(CXX) to do this
correctly
+ unset(CMAKE_CXX_COMPILER)
+ unset(CMAKE_CXX_COMPILER CACHE)
enable_language(CXX)
- # This effectively checks for cmake version 3.1 or later
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
