-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixes build failure when upgrading from older version. Closes: https://trac.macports.org/ticket/56246
- Loading branch information
1 parent
9ca502e
commit 56005de
Showing
2 changed files
with
45 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
Search libzip source path before other include paths. | ||
https://github.com/nih-at/libzip/commit/4cd3c601cb48be89cd9e6e5082cc7bbe47e8a003 | ||
--- lib/CMakeLists.txt.orig | ||
+++ lib/CMakeLists.txt | ||
@@ -179,7 +179,7 @@ ELSE(WIN32) | ||
) | ||
ENDIF(WIN32) | ||
|
||
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..) | ||
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..) | ||
|
||
ADD_CUSTOM_TARGET(update_zip_err_str | ||
COMMAND sh ${CMAKE_CURRENT_SOURCE_DIR}/make_zip_err_str.sh ${CMAKE_CURRENT_SOURCE_DIR}/zip.h ${CMAKE_CURRENT_SOURCE_DIR}/zip_err_str.c | ||
--- regress/CMakeLists.txt.orig | ||
+++ regress/CMakeLists.txt | ||
@@ -1,8 +1,6 @@ | ||
CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT) | ||
IF(NOT HAVE_GETOPT) | ||
SET(SRC_EXTRA_FILES ../src/getopt.c) | ||
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} | ||
- ${CMAKE_CURRENT_SOURCE_DIR}/../src) | ||
ENDIF() | ||
|
||
SET(TEST_PROGRAMS | ||
@@ -203,8 +201,6 @@ FOREACH(CASE ${EXTRA_TESTS}) | ||
SET_TESTS_PROPERTIES(${CASE} PROPERTIES SKIP_RETURN_CODE 77) | ||
ENDFOREACH() | ||
|
||
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../lib | ||
- ${CMAKE_CURRENT_SOURCE_DIR}/../src | ||
- ${CMAKE_CURRENT_BINARY_DIR}/..) | ||
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_BINARY_DIR}/..) | ||
|
||
ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND}) | ||
--- src/CMakeLists.txt.orig | ||
+++ src/CMakeLists.txt | ||
@@ -1,5 +1,4 @@ | ||
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../lib | ||
- ${CMAKE_CURRENT_BINARY_DIR}/..) | ||
+INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../lib ${CMAKE_CURRENT_BINARY_DIR}/..) | ||
|
||
CHECK_FUNCTION_EXISTS(getopt HAVE_GETOPT) | ||
IF(NOT HAVE_GETOPT) |