mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 04:38:59 +08:00
47d206e149
* [many ports] improve compatibility with WSL and mixed case filesystems * [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there * [libharu] add compatibility with non-win32 platforms * [geogram] fix openblas on linux [clapack] better integration with linux environment [visit-struct] put cmake config file in the expected folder [geogram] remove trailing underscore to enable compatibility with OpenBLAS * [openblas] playing with underscore, without success * [openblas/lapack] fix library integration * [clapack] improve target handling in cmake module * [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs * [clapack,openblas] improve libraries integration * [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags * [suitesparse] improve integration with new lapack/openblas mechanism * [suitesparse] add no underscore postfix also for linux * [ceres] fix integration with newer openblas/lapack configs * [aws-c-event-stream] fix regression * [systemc] fix regression * [libwebp,geogram] trigger rebuild * [libwebp,pthread4w] fix regressions * [glbinding] fix cmake module installation * [globjects] disentangle unnecessary dependency from qt5 * [jasper] remove broken and unnecessary patches * [libwebp] fix regression * [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files * [clapack] correctly find dlls * [clapack] use a generic blas as dependency * [fizz,g2o] restore expected version * fix mistake * [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports * [libressl,openssl] do not try to build one if the other is already installed * [itk] update ref and patch to avoid regression * [libressl,openssl] implement full strategy to fix CI * [libwebp] disable components that are broken on macOS * [ogre] enable macOS build * [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169 * [ogre] add missing install command * [ffmpeg] enable wrapper for cmake module * [ffmpeg] add avresample module finder * [ffmpeg] improve module detection and exported symbols * [ffmpeg] add variables to cache * [thrift] remove unnecessary build option * [allegro5] fix shared/static inversion * [protobuf] cleanup * [libressl] cleanup * [moos-core] cleanup * commented features must not be separated from other features, otherwise vcpkg complains * [itk] fix regression * [shogun,itk] fix regressions * [ogre] fix regression * [opusfile] add compatibility with non-win32 * [itk] fix regression * [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile * add missing dependencies * [ismrmrd] fix regression * [ffmpeg] trigger rebuild * [clapack,openblas,libogg] fix regressions on macOS * [libtins] fix regression * force rebuild windows regressions, unable to reproduce locally * [mosquitto] enable non-win32 builds * [json-dto] force rebuild, unable to reproduce regression locally * [many ports] uniform naming and path length requests * fix regression * fix regression * [ffmpeg] fixes for downstream projects * clean up - thanks to reviewers * trigger rebuild of regressions on macOS * trigger rebuild of regressions on macOS - part2 * Add core back * Use VCPKG_CONCURRENCY * Add core back to suitesparse * Add core back to curl * Add core back to magnum * Add core back to magnum * Add core back to magnum * Add core back to cgal
63 lines
3.2 KiB
Diff
63 lines
3.2 KiB
Diff
diff --git a/3rdparty/KHR/CMakeLists.txt b/3rdparty/KHR/CMakeLists.txt
|
|
index 25fac3a..429544f 100644
|
|
--- a/3rdparty/KHR/CMakeLists.txt
|
|
+++ b/3rdparty/KHR/CMakeLists.txt
|
|
@@ -43,7 +43,7 @@ add_library(${target} INTERFACE)
|
|
add_library(externals::${target} ALIAS ${target})
|
|
|
|
# Export library for downstream projects
|
|
-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
|
|
+export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake)
|
|
|
|
|
|
#
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 700b48b..8aaab8d 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -141,15 +141,15 @@ endif()
|
|
if(1)
|
|
# Install into the system (/usr/bin or /usr/local/bin)
|
|
set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
|
|
- set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
|
|
+ set(INSTALL_CMAKE "share/${project}") # /usr/[local]/share/<project>/cmake
|
|
set(INSTALL_EXAMPLES "share/${project}") # /usr/[local]/share/<project>
|
|
set(INSTALL_DATA "share/${project}") # /usr/[local]/share/<project>
|
|
set(INSTALL_BIN "bin") # /usr/[local]/bin
|
|
set(INSTALL_SHARED "lib") # /usr/[local]/lib
|
|
set(INSTALL_LIB "lib") # /usr/[local]/lib
|
|
set(INSTALL_INCLUDE "include") # /usr/[local]/include
|
|
- set(INSTALL_DOC "share/doc/${project}") # /usr/[local]/share/doc/<project>
|
|
- set(INSTALL_SHORTCUTS "share/applications") # /usr/[local]/share/applications
|
|
+ set(INSTALL_DOC "share/${project}/doc") # /usr/[local]/share/doc/<project>
|
|
+ set(INSTALL_SHORTCUTS "share/${project}/applications") # /usr/[local]/share/applications
|
|
set(INSTALL_ICONS "share/pixmaps") # /usr/[local]/share/pixmaps
|
|
set(INSTALL_INIT "etc/init") # /etc/init (upstart init scripts)
|
|
else()
|
|
diff --git a/source/glbinding-aux/CMakeLists.txt b/source/glbinding-aux/CMakeLists.txt
|
|
index 61cc166..cb0758a 100644
|
|
--- a/source/glbinding-aux/CMakeLists.txt
|
|
+++ b/source/glbinding-aux/CMakeLists.txt
|
|
@@ -137,7 +137,7 @@ add_library(${target}
|
|
add_library(${META_PROJECT_NAME}::${target} ALIAS ${target})
|
|
|
|
# Export library for downstream projects
|
|
-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
|
|
+export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake)
|
|
|
|
# Create API export header
|
|
generate_export_header(${target}
|
|
diff --git a/source/glbinding/CMakeLists.txt b/source/glbinding/CMakeLists.txt
|
|
index bca68d1..f014494 100644
|
|
--- a/source/glbinding/CMakeLists.txt
|
|
+++ b/source/glbinding/CMakeLists.txt
|
|
@@ -172,7 +172,7 @@ add_library(${target}
|
|
add_library(${META_PROJECT_NAME}::${target} ALIAS ${target})
|
|
|
|
# Export library for downstream projects
|
|
-export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/cmake/${target}/${target}-export.cmake)
|
|
+export(TARGETS ${target} NAMESPACE ${META_PROJECT_NAME}:: FILE ${PROJECT_BINARY_DIR}/${target}-export.cmake)
|
|
|
|
# Create API export header
|
|
generate_export_header(${target}
|