mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 07:57:49 +08:00
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
|
||
|
|
index beb83e2..6f216bd 100644
|
||
|
|
--- a/apps/CMakeLists.txt
|
||
|
|
+++ b/apps/CMakeLists.txt
|
||
|
|
@@ -155,7 +152,7 @@ endif()
|
||
|
|
# Targets installation
|
||
|
|
|
||
|
|
install(TARGETS ${LIBLAS_UTILITIES}
|
||
|
|
- RUNTIME DESTINATION ${LIBLAS_BIN_DIR}
|
||
|
|
+ RUNTIME DESTINATION tools
|
||
|
|
LIBRARY DESTINATION ${LIBLAS_LIB_DIR}
|
||
|
|
ARCHIVE DESTINATION ${LIBLAS_LIB_DIR})
|
||
|
|
|
||
|
|
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
|
||
|
|
index c7f583d..ca9e602 100644
|
||
|
|
--- a/cmake/CMakeLists.txt
|
||
|
|
+++ b/cmake/CMakeLists.txt
|
||
|
|
@@ -5,13 +5,8 @@
|
||
|
|
# Set where cmake will install liblas-config.cmake. It's installed in
|
||
|
|
# ${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR} and ${PROJECT_ROOT_DIR}
|
||
|
|
# is the relative path to the root from there.
|
||
|
|
-if (NOT WIN32)
|
||
|
|
- set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
|
||
|
|
- set (PROJECT_ROOT_DIR "../../..")
|
||
|
|
-else ()
|
||
|
|
- set(INSTALL_CMAKE_DIR "cmake")
|
||
|
|
- set (PROJECT_ROOT_DIR "..")
|
||
|
|
-endif ()
|
||
|
|
+set(INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
|
||
|
|
+set (PROJECT_ROOT_DIR "../../..")
|
||
|
|
|
||
|
|
# Now create the liblas-config files using the .in templates
|
||
|
|
configure_file (liblas-config.cmake.in
|