diff options
| author | Francois Rivard <30326057+RoguePointer80@users.noreply.github.com> | 2020-09-27 21:18:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-27 18:18:27 -0700 |
| commit | 741c8cbecde77f771f8c05f00f59a436a2b4213b (patch) | |
| tree | 2c77fb7d283deb47a0ad612764d6dcc243f380b9 /scripts | |
| parent | 64a281b865f31cf846c1e36d635361c2eaa985f4 (diff) | |
| download | vcpkg-741c8cbecde77f771f8c05f00f59a436a2b4213b.tar.gz vcpkg-741c8cbecde77f771f8c05f00f59a436a2b4213b.zip | |
[vcpkg] Add compiler info to nuspec description (#13571)
* Add compiler info to nuspec description
* Run clang-format on some files
* Fix the unit tests
* [vcpkg] Clarify NuGet description to note 'CXX compiler'
* [vcpkg] Fix tests
Co-authored-by: frivard <frivard@coveo.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/detect_compiler/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/detect_compiler/CMakeLists.txt b/scripts/detect_compiler/CMakeLists.txt index ea27db2b9..80961c40b 100644 --- a/scripts/detect_compiler/CMakeLists.txt +++ b/scripts/detect_compiler/CMakeLists.txt @@ -6,7 +6,6 @@ if(CMAKE_GENERATOR STREQUAL "Ninja" AND CMAKE_SYSTEM_NAME STREQUAL "Windows") set(CMAKE_C_COMPILER_ID_RUN 1)
set(CMAKE_C_COMPILER_FORCED 1)
set(CMAKE_CXX_COMPILER_WORKS 1)
- set(CMAKE_CXX_COMPILER_ID_RUN 1)
set(CMAKE_CXX_COMPILER_FORCED 1)
endif()
@@ -18,3 +17,5 @@ file(SHA1 "${CMAKE_C_COMPILER}" C_HASH) string(SHA1 COMPILER_HASH "${C_HASH}${CXX_HASH}")
message("#COMPILER_HASH#${COMPILER_HASH}")
+message("#COMPILER_CXX_VERSION#${CMAKE_CXX_COMPILER_VERSION}")
+message("#COMPILER_CXX_ID#${CMAKE_CXX_COMPILER_ID}")
|