mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 19:17:53 +08:00
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}
|