diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index 5a216a2..e52c3db 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -69,7 +69,7 @@ jobs: Copy-Item $vcpkgPath\installed\${{ env.ARCH }}-windows\bin\tiff.dll "${{ github.workspace }}\install\bin\" Copy-Item $vcpkgPath\installed\${{ env.ARCH }}-windows\bin\jpeg62.dll "${{ github.workspace }}\install\bin\" Copy-Item $vcpkgPath\installed\${{ env.ARCH }}-windows\bin\zlib1.dll "${{ github.workspace }}\install\bin\" - Copy-Item $vcpkgPath\installed\${{ env.ARCH }}-windows\bin\lzma.dll "${{ github.workspace }}\install\bin\" + Copy-Item $vcpkgPath\installed\${{ env.ARCH }}-windows\bin\liblzma.dll "${{ github.workspace }}\install\bin\" - name: Publish artifacts uses: actions/upload-artifact@v2 diff --git a/libgeotiff/CMakeLists.txt b/libgeotiff/CMakeLists.txt index 1840258..a00e25a 100644 --- a/libgeotiff/CMakeLists.txt +++ b/libgeotiff/CMakeLists.txt @@ -5,6 +5,8 @@ # Author: Mateusz Loskot # ############################################################################### +CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0) + PROJECT(GeoTIFF) include(GNUInstallDirs) @@ -14,8 +16,6 @@ SET(GEOTIFF_LIBRARY_TARGET geotiff_library) ############################################################################## # CMake settings -CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0) - SET(CMAKE_COLOR_MAKEFILE ON) # Version information @@ -311,17 +311,18 @@ endif() SET_TARGET_PROPERTIES(${GEOTIFF_LIBRARY_TARGET} PROPERTIES OUTPUT_NAME ${GEOTIFF_LIB_NAME}) -set(CONFIG_DEPENDENCIES "") +set(CONFIG_PUBLIC_DEPENDENCIES "") +set(CONFIG_PRIVATE_DEPENDENCIES "") if(TARGET TIFF::TIFF) set(TIFF_LIBRARIES TIFF::TIFF) - string(APPEND CONFIG_DEPENDENCIES " find_dependency(TIFF)\n") + string(APPEND CONFIG_PUBLIC_DEPENDENCIES "find_dependency(TIFF)\n") endif() target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PUBLIC ${TIFF_LIBRARIES}) if(TARGET PROJ::proj) set(PROJ_LIBRARIES PROJ::proj) - string(APPEND CONFIG_DEPENDENCIES " find_dependency(PROJ CONFIG)\n") + string(APPEND CONFIG_PRIVATE_DEPENDENCIES " find_dependency(PROJ CONFIG)\n") endif() target_link_libraries(${GEOTIFF_LIBRARY_TARGET} PRIVATE ${PROJ_LIBRARIES}) diff --git a/libgeotiff/cmake/project-config.cmake.in b/libgeotiff/cmake/project-config.cmake.in index 3690489..f8a9752 100644 --- a/libgeotiff/cmake/project-config.cmake.in +++ b/libgeotiff/cmake/project-config.cmake.in @@ -22,13 +22,14 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/bin") unset (_ROOT) unset (_DIR) +include(CMakeFindDependencyMacro) +@CONFIG_PUBLIC_DEPENDENCIES@ set (@PROJECT_NAME@_LIBRARIES @GEOTIFF_LIBRARY_TARGET@) if("@BUILD_SHARED_LIBS@") set (@PROJECT_NAME@_SHARED_LIBRARIES ${@PROJECT_NAME@_LIBRARIES}) else() set (@PROJECT_NAME@_STATIC_LIBRARIES ${@PROJECT_NAME@_LIBRARIES}) - include(CMakeFindDependencyMacro) -@CONFIG_DEPENDENCIES@ +@CONFIG_PRIVATE_DEPENDENCIES@ endif() if(NOT @PROJECT_NAME@_FIND_QUIETLY)