mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:50:26 +08:00
957d2024b8
* Update Ubuntu to 20.04. * [tfhe] Disable -Wall -Werror * [sophus] Disable -Werror. * Fix typo in deployment of CUDA. * Add libxxf86vm-dev for opensubdiv. * [opensubdiv] Fix OpenCL search on Ubuntu 20.04, and document libxxf86vm-dev dependency * [msgpack11] Disable -Werror. * [qtwayland, qt5wayland] Add system library notice. * Add python-is-python3 to unbreak tensorflow, v8, and others * [graphqlparser] Remove directive rejected by Bison 3.5.1 * [ogdf] Mark as failing in ci.baseline.txt. Issue filed https://github.com/microsoft/vcpkg/issues/18936 * [bde] Mark failing in ci.baseline.txt, issue filed https://github.com/microsoft/vcpkg/issues/18937 * [soem] Patch out -Werror * Update pool.
43 lines
1.9 KiB
Diff
43 lines
1.9 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1778965..4c481b7 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE)
|
|
|
|
if(WIN32)
|
|
set(OS "win32")
|
|
- find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
|
|
- find_library(winpcap_LIBRARY NAMES wpcap)
|
|
- find_library(packet_LIBRARY NAMES packet)
|
|
- include_directories(${winpcap_INCLUDE_DIRS})
|
|
+ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
|
|
+ find_library(winpcap_LIBRARY NAMES wpcap)
|
|
+ find_library(packet_LIBRARY NAMES packet)
|
|
+ include_directories(${winpcap_INCLUDE_DIRS})
|
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
|
|
- set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
|
|
+ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
|
|
elseif(UNIX AND NOT APPLE)
|
|
set(OS "linux")
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
|
|
set(OS_LIBS pthread rt)
|
|
elseif(APPLE)
|
|
# This must come *before* linux or MacOSX will identify as Unix.
|
|
set(OS "macosx")
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
|
|
set(OS_LIBS pthread pcap)
|
|
elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
|
|
set(OS "rtk")
|
|
@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
|
|
include_directories(oshw/${OS}/${ARCH})
|
|
file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c)
|
|
set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}")
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format")
|
|
set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group")
|
|
elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems")
|
|
message("Building for RTEMS")
|