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/stormlib | |
| 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/stormlib')
| -rw-r--r-- | ports/stormlib/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/stormlib/CONTROL | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ports/stormlib/CMakeLists.txt b/ports/stormlib/CMakeLists.txt index 6a85775b5..e8bf793ab 100644 --- a/ports/stormlib/CMakeLists.txt +++ b/ports/stormlib/CMakeLists.txt @@ -268,6 +268,12 @@ if(WIN32) target_compile_definitions(stormlib PRIVATE UNICODE _UNICODE)
endif()
+if(NOT MSVC)
+ # don't error on implicit declarations, which are invalid in C99 but commonly used
+ target_compile_options(stormlib PRIVATE -Wno-error=implicit-function-declaration)
+endif()
+
+
set_target_properties(stormlib PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h")
install(TARGETS stormlib EXPORT stormlibConfig
@@ -277,4 +283,4 @@ install(TARGETS stormlib EXPORT stormlibConfig PUBLIC_HEADER DESTINATION include
)
-install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib)
\ No newline at end of file +install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib)
diff --git a/ports/stormlib/CONTROL b/ports/stormlib/CONTROL index 7f1513b78..4a38c9f3d 100644 --- a/ports/stormlib/CONTROL +++ b/ports/stormlib/CONTROL @@ -1,4 +1,5 @@ Source: stormlib
-Version: 2019-05-10-1
+Version: 2019-05-10
+Port-Version: 2
Build-Depends: zlib, bzip2
Description: StormLib is a library for opening and manipulating Blizzard MPQ files
|