blob: 277e81ef7f75cbf13677ea72b7cf75ccf274f2ff (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
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
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e35de06..f7c25d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -226,7 +226,8 @@ target_link_libraries(${LIBLAS_LIB_NAME}
${GEOTIFF_LIBRARY}
${GDAL_LIBRARY}
${LASZIP_LIBRARY}
- ${Boost_LIBRARIES})
+ ${Boost_LIBRARIES}
+ proj)
target_link_libraries(${LIBLAS_C_LIB_NAME}
${LIBLAS_LIB_NAME} )
|
