Pārlūkot izejas kodu

Merge pull request #5529 from anhu/wextra

Fix Windows CMakeList compiler options
David Garske 1 gadu atpakaļ
vecāks
revīzija
38e4ecc27c
2 mainītis faili ar 24 papildinājumiem un 0 dzēšanām
  1. 5 0
      CMakeLists.txt
  2. 19 0
      INSTALL

+ 5 - 0
CMakeLists.txt

@@ -169,7 +169,12 @@ find_package(Threads)
 # Example for map file and custom linker script
 #set(CMAKE_EXE_LINKER_FLAGS " -Xlinker -Map=output.map -T\"${CMAKE_CURRENT_SOURCE_DIR}/linker.ld\"")
 
+if(WIN32)
+# Windows cl.exe does not support the -Wextra, -Wno-unused and -Werror flags.
+set(CMAKE_C_FLAGS "-Wall ${CMAKE_C_FLAGS}")
+else()
 set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Werror ${CMAKE_C_FLAGS}")
+endif()
 
 ####################################################
 # Build Options

+ 19 - 0
INSTALL

@@ -233,3 +233,22 @@
           environments. All OIDs and codepoints are temporary and expected to
           change in the future. You should have no expectation of backwards
           compatibility.
+
+16. Building with vcpkg
+
+# Building wolfssl - Using vcpkg
+
+ You can download and install wolfssl using the [vcpkg](https://github.com/Microsoft/vcpkg):
+
+    git clone https://github.com/Microsoft/vcpkg.git
+    cd vcpkg
+    ./bootstrap-vcpkg.sh
+    OR for Windows
+    bootstrap-vcpkg.bat
+
+    ./vcpkg integrate install
+    ./vcpkg install wolfssl
+
+The wolfssl port in vcpkg is kept up to date by wolfSSL.
+
+We also have vcpkg ports for wolftpm, wolfmqtt and curl.