diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-09-24 15:15:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 15:15:06 -0700 |
| commit | 4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3 (patch) | |
| tree | 371509cc59c45895c85e5e049aaa2cd9c39cc7b0 /ports/licensepp/fix-cmake.patch | |
| parent | c1acea1f044d3300b0c3791c2ce74d53e5a15548 (diff) | |
| download | vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.tar.gz vcpkg-4cbbcbddfd42d94d6d8ee6c8b6ad00ef6a0927d3.zip | |
[vcpkg macos ci] Switch to using our own base boxes, to fix bringing up mac machines (#13619)
* [vcpkg ci:osx] Remove brew install
* add instructions for creating a new vagrant box
* fix the vagrant scripts for the new box
* finish fixing the setup
* [mecab jxrlib] fix ports for CI
mecab needed to use an actual ref that wasn't master,
and jxrlib needed a patch for xcode 12 CLTs.
Additionally, this fixes the mecab version to be a date, the date of the last commit,
since `1.0` is not the correct version (mecab doesn't have released versions)
* [many ports] fix compile with Xcode 12 CLTs
This mostly means fixing errors on implicit-function-declaration,
and removing some Werrors
* alac-decoder
* apr
* argtable2
* arrow
* hyperscan
* mcpp
* minizip
* mosquitto
* stormlib
* [many ports] even more Xcode 12 CLT fixes
* [jxrlib darknet] fix the last ports! (hopefully)
* CRs, plus minor wip changes to osx scripts
Diffstat (limited to 'ports/licensepp/fix-cmake.patch')
| -rw-r--r-- | ports/licensepp/fix-cmake.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/ports/licensepp/fix-cmake.patch b/ports/licensepp/fix-cmake.patch deleted file mode 100644 index f421b6d92..000000000 --- a/ports/licensepp/fix-cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git "a/CMakeLists.txt" "b/CMakeLists.txt" -index b2c39d1..24a6866 100644 ---- "a/CMakeLists.txt" -+++ "b/CMakeLists.txt" -@@ -35,10 +35,8 @@ if (APPLE) - endif() - endif() - --if(MSVC) -- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 ") --else() -- list (APPEND CMAKE_CXX_FLAGS " -std=c++11 -O3 -Wall -Werror ") -+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3 -Wall -Werror") - endif() - - # Check for cryptopp (static) -@@ -73,6 +71,7 @@ endif() - set_target_properties (licensepp-lib PROPERTIES - VERSION ${LICENSEPP_SOVERSION} - ) -+target_include_directories (licensepp-lib PUBLIC $<INSTALL_INTERFACE:include>) - target_link_libraries (licensepp-lib - ${CRYPTOPP_LIBRARIES} - ) |