68 lines
2.7 KiB
Diff
68 lines
2.7 KiB
Diff
diff -rupN libgeotiff-1.7.0/cmake/CMakeLists.txt libgeotiff-1.7.0-new/cmake/CMakeLists.txt
|
|
--- libgeotiff-1.7.0/cmake/CMakeLists.txt 2021-03-06 18:47:06.000000000 +0100
|
|
+++ libgeotiff-1.7.0-new/cmake/CMakeLists.txt 2022-02-20 01:14:12.921648760 +0100
|
|
@@ -6,13 +6,8 @@
|
|
# ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
|
|
# path to the root from there. (Note that the whole install tree can
|
|
# be relocated.)
|
|
-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 "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
|
|
+set (PROJECT_ROOT_DIR "../../..")
|
|
|
|
configure_file (project-config.cmake.in project-config.cmake @ONLY)
|
|
configure_file (project-config-version.cmake.in
|
|
diff -rupN libgeotiff-1.7.0/CMakeLists.txt libgeotiff-1.7.0-new/CMakeLists.txt
|
|
--- libgeotiff-1.7.0/CMakeLists.txt 2021-06-30 10:51:17.000000000 +0200
|
|
+++ libgeotiff-1.7.0-new/CMakeLists.txt 2022-02-20 01:12:42.518986798 +0100
|
|
@@ -285,9 +285,9 @@ SET(GEOTIFF_INCLUDE_DIR ${GEOTIFF_INCLUD
|
|
SET(GEOTIFF_DATA_DIR ${GEOTIFF_DATA_SUBDIR})
|
|
|
|
# Install doc files
|
|
-INSTALL(FILES
|
|
- AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
|
|
- DESTINATION doc)
|
|
+#INSTALL(FILES
|
|
+ #AUTHORS ChangeLog COPYING INSTALL LICENSE README README_BIN README.WIN
|
|
+ #DESTINATION doc)
|
|
# DESTINATION ${GEOTIFF_DATA_DIR}/doc)
|
|
|
|
# Install man pages
|
|
@@ -295,8 +295,8 @@ INSTALL(FILES ${GEOTIFF_MAN_PAGES} DESTI
|
|
|
|
|
|
# Install header files for development distribution
|
|
-# INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
|
|
-INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include)
|
|
+INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION ${GEOTIFF_INCLUDE_DIR})
|
|
+#INSTALL(FILES ${GEOTIFF_LIB_HEADERS} DESTINATION include)
|
|
|
|
###############################################################################
|
|
# Build libxtiff library
|
|
@@ -358,6 +358,9 @@ ELSE(UNIX)
|
|
SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
|
|
OUTPUT_NAME ${GEOTIFF_LIB_NAME})
|
|
ENDIF(UNIX)
|
|
+IF(MINGW)
|
|
+ SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES SUFFIX "-${LINK_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
|
+ENDIF(MINGW)
|
|
|
|
SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES
|
|
OUTPUT_NAME ${GEOTIFF_LIB_NAME})
|
|
@@ -376,8 +379,8 @@ TARGET_LINK_LIBRARIES(${GEOTIFF_LIBRARY_
|
|
INSTALL( TARGETS ${GEOTIFF_LIBRARY_TARGET}
|
|
EXPORT depends
|
|
RUNTIME DESTINATION bin
|
|
- LIBRARY DESTINATION lib
|
|
- ARCHIVE DESTINATION lib )
|
|
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
|
|
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} )
|
|
|
|
# Define grouping of source files in PROJECT file (e.g. Visual Studio)
|
|
SOURCE_GROUP("CMake Files" FILES CMakeLists.txt)
|