Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake: simplify PROJ detection (refs https://github.com/OSGeo/gdal/issues/8942#issuecomment-1851319732) #8964

Merged
merged 1 commit into from
Dec 14, 2023
Merged

CMake: simplify PROJ detection (refs https://github.com/OSGeo/gdal/issues/8942#issuecomment-1851319732) #8964

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions cmake/helpers/CheckDependentLibraries.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,8 @@ if (GDAL_USE_CRYPTOPP)
option(CRYPTOPP_USE_ONLY_CRYPTODLL_ALG "Use Only cryptoDLL alg. only work on dynamic DLL" OFF)
endif ()

# First check with CMake config files (starting at version 8, due to issues with earlier ones), and then fallback to the FindPROJ module.
find_package(PROJ 9 CONFIG QUIET)
if (NOT PROJ_FOUND)
find_package(PROJ 8 CONFIG QUIET)
endif()
# First check with CMake config files, and then fallback to the FindPROJ module.
find_package(PROJ CONFIG)
if (PROJ_FOUND)
string(APPEND GDAL_IMPORT_DEPENDENCIES "find_dependency(PROJ ${PROJ_VERSION_MAJOR} CONFIG)\n")
else()
Expand Down
Loading