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/argtable2/fix-install-dirs.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/argtable2/fix-install-dirs.patch')
| -rw-r--r-- | ports/argtable2/fix-install-dirs.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/ports/argtable2/fix-install-dirs.patch b/ports/argtable2/fix-install-dirs.patch deleted file mode 100644 index 5a9be4d72..000000000 --- a/ports/argtable2/fix-install-dirs.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3427487..a9b8be0 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,4 @@ --# for now, install in subdirectory of source directory by default --SET( CMAKE_INSTALL_PREFIX .. ) -+include(GNUInstallDirs) - - IF( WIN32 ) - ADD_LIBRARY( argtable2 arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c ) -@@ -7,5 +6,9 @@ ELSE( WIN32 ) - ADD_LIBRARY( argtable2 arg_date.c arg_dbl.c arg_end.c arg_file.c arg_int.c arg_lit.c arg_rem.c arg_rex.c arg_str.c argtable2.c argtable2.h getopt.c getopt.h getopt1.c ) - ENDIF( WIN32 ) - --INSTALL( TARGETS argtable2 ARCHIVE DESTINATION lib) --SET_TARGET_PROPERTIES( argtable2 PROPERTIES DEBUG_POSTFIX d ) -\ No newline at end of file -+INSTALL(TARGETS argtable2 -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+) -+INSTALL(FILES argtable2.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) |