mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 03:10:57 +08:00
d0745d16a9
* Bump foonathan-memory version. * Remove port-version. Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * Changed REF to version tag. * Updates git-tree. * Removes commented lines. * Update ports/foonathan-memory/vcpkg.json Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> * [foonathan_memory]: update to 0.7-3 * fix deps * fix deps * fix deps * fix deps * fix deps * CI --------- Co-authored-by: Correia, Marco <correiam@ryanair.com> Co-authored-by: Marco Correia <marco.v.correia@gmail.com> Co-authored-by: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index ddbc459..06c4165 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -20,7 +20,7 @@ set(CMAKE_DEBUG_POSTFIX "-dbg")
|
|
if(UNIX OR VXWORKS)
|
|
include(GNUInstallDirs)
|
|
|
|
- set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/foonathan_memory")
|
|
+ set(FOONATHAN_MEMORY_INC_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}")
|
|
set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}")
|
|
set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
|
|
set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
|
|
@@ -29,7 +29,7 @@ if(UNIX OR VXWORKS)
|
|
set(FOONATHAN_MEMORY_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/foonathan_memory/cmake")
|
|
set(FOONATHAN_MEMORY_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/foonathan_memory")
|
|
elseif(WIN32)
|
|
- set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/foonathan_memory")
|
|
+ set(FOONATHAN_MEMORY_INC_INSTALL_DIR "include/")
|
|
set(FOONATHAN_MEMORY_RUNTIME_INSTALL_DIR "bin")
|
|
set(FOONATHAN_MEMORY_LIBRARY_INSTALL_DIR "bin")
|
|
set(FOONATHAN_MEMORY_ARCHIVE_INSTALL_DIR "lib")
|