diff options
| author | Charles Karney <charles.karney@sri.com> | 2020-02-04 14:20:28 -0500 |
|---|---|---|
| committer | Charles Karney <charles.karney@sri.com> | 2020-02-04 14:20:28 -0500 |
| commit | c74781ea2710f18a9f1c9728fa5eca5d3601ad5b (patch) | |
| tree | 098b6e3fde86e89d0a2daa69976769f65b576a81 /CMakeLists.txt | |
| parent | c3e7876325e5d43586a7eee43db1df9468f90d65 (diff) | |
| download | PROJ-c74781ea2710f18a9f1c9728fa5eca5d3601ad5b.tar.gz PROJ-c74781ea2710f18a9f1c9728fa5eca5d3601ad5b.zip | |
Make PROJ the CMake project name
Allow both find_package(PROJ) and find_package(PROJ4). More details
are in cmake/CMakeLists.txt.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e0dba46..d3ccac86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,9 +11,7 @@ ################################################################################ cmake_minimum_required(VERSION 3.9 FATAL_ERROR) -# For historic reasons, the CMake PROJECT-NAME is PROJ4 -project(PROJ4 LANGUAGES C CXX) -set(PROJECT_INTERN_NAME PROJ) +project(PROJ LANGUAGES C CXX) # Only interpret if() arguments as variables or keywords when unquoted cmake_policy(SET CMP0054 NEW) @@ -92,7 +90,7 @@ set(PROJ_CXX_WARN_FLAGS "${PROJ_CXX_WARN_FLAGS}" # PROJ CMake modules ################################################################################ # Path to additional CMake modules -set(CMAKE_MODULE_PATH ${PROJ4_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +set(CMAKE_MODULE_PATH ${PROJ_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) include(ProjUtilities) @@ -235,7 +233,7 @@ set(DOCDIR "${DEFAULT_DOCDIR}" set(INCLUDEDIR "${DEFAULT_INCLUDEDIR}" CACHE PATH "The directory to install includes into.") set(CMAKECONFIGDIR "${DEFAULT_CMAKEDIR}" - CACHE PATH "The directory to install cmake config files into.") + CACHE PATH "Parent of the directory to install cmake config files into.") ################################################################################ # Tests @@ -256,7 +254,7 @@ endif() ################################################################################ # Build configured components ################################################################################ -include_directories(${PROJ4_SOURCE_DIR}/src) +include_directories(${PROJ_SOURCE_DIR}/src) message(STATUS "") add_subdirectory(data) |