mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 9741b45f9..11b397024 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -281,7 +281,7 @@ message(STATUS "Wrote ${PROJECT_BINARY_DIR}/config.h")
|
||
|
|
configure_file(${PROJECT_SOURCE_DIR}/cmake/json_config.h.in ${PROJECT_BINARY_DIR}/json_config.h)
|
||
|
|
message(STATUS "Wrote ${PROJECT_BINARY_DIR}/json_config.h")
|
||
|
|
|
||
|
|
-if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
|
||
|
|
+if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" AND NOT MSVC)
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffunction-sections -fdata-sections")
|
||
|
|
if ("${DISABLE_WERROR}" STREQUAL "OFF")
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
|
||
|
|
@@ -297,7 +297,7 @@ if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL
|
||
|
|
endif()
|
||
|
|
|
||
|
|
add_definitions(-D_GNU_SOURCE)
|
||
|
|
-elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
|
||
|
|
+elseif (MSVC)
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /DEBUG")
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4100")
|
||
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4996")
|