diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-24 14:13:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-08-24 14:13:10 (GMT) |
| commit | 107df8e65019b89f82249395bc09efe5dc9e2a7f (patch) | |
| tree | 552fc25b0159b83e08be798f5ae30dc3d80a5266 /Utilities/cmlibarchive/build | |
| parent | 3d05964b0293a0bb9eb9f1f3b6d3cff1d86aa85a (diff) | |
| parent | dadea0e5ce7dd04c7a2c1d22f3fd12affdbd6a89 (diff) | |
| download | CMake-107df8e65019b89f82249395bc09efe5dc9e2a7f.zip CMake-107df8e65019b89f82249395bc09efe5dc9e2a7f.tar.gz CMake-107df8e65019b89f82249395bc09efe5dc9e2a7f.tar.bz2 | |
Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
LibArchive 2020-12-26 (227a4b97)
Diffstat (limited to 'Utilities/cmlibarchive/build')
| -rw-r--r-- | Utilities/cmlibarchive/build/cmake/CreatePkgConfigFile.cmake | 4 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/build/cmake/config.h.in | 4 | ||||
| -rw-r--r-- | Utilities/cmlibarchive/build/version | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Utilities/cmlibarchive/build/cmake/CreatePkgConfigFile.cmake b/Utilities/cmlibarchive/build/cmake/CreatePkgConfigFile.cmake index fc8529a..bc5a43f 100644 --- a/Utilities/cmlibarchive/build/cmake/CreatePkgConfigFile.cmake +++ b/Utilities/cmlibarchive/build/cmake/CreatePkgConfigFile.cmake @@ -24,10 +24,10 @@ ENDFOREACH() # thus there's a good chance it'll make some binutils versions unhappy... # This only affects Libs.private (looked up for static builds) though. CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc.in - ${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc + ${CMAKE_CURRENT_BINARY_DIR}/build/pkgconfig/libarchive.pc @ONLY) # And install it, of course ;). IF(ENABLE_INSTALL) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/build/pkgconfig/libarchive.pc + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/build/pkgconfig/libarchive.pc DESTINATION "lib/pkgconfig") ENDIF() diff --git a/Utilities/cmlibarchive/build/cmake/config.h.in b/Utilities/cmlibarchive/build/cmake/config.h.in index f38601f..9bd2667 100644 --- a/Utilities/cmlibarchive/build/cmake/config.h.in +++ b/Utilities/cmlibarchive/build/cmake/config.h.in @@ -1,4 +1,5 @@ /* config.h. Generated from build/cmake/config.h.in by cmake configure */ +#define __LIBARCHIVE_CONFIG_H_INCLUDED 1 #if defined(__osf__) # define _OSF_SOURCE #endif @@ -742,6 +743,9 @@ /* Define to 1 if you have the `strchr' function. */ #cmakedefine HAVE_STRCHR 1 +/* Define to 1 if you have the `strnlen' function. */ +#cmakedefine HAVE_STRNLEN 1 + /* Define to 1 if you have the `strdup' function. */ #cmakedefine HAVE_STRDUP 1 diff --git a/Utilities/cmlibarchive/build/version b/Utilities/cmlibarchive/build/version index 78be3ab..205791c 100644 --- a/Utilities/cmlibarchive/build/version +++ b/Utilities/cmlibarchive/build/version @@ -1 +1 @@ -3004002 +3005001 |