diff options
| author | mwtoews <mwtoews@gmail.com> | 2018-03-26 07:59:07 +1300 |
|---|---|---|
| committer | mwtoews <mwtoews@gmail.com> | 2018-03-26 07:59:07 +1300 |
| commit | d68054678282c2aea509bd700aa5a4af4173827d (patch) | |
| tree | d5134659cfe32601699cb1c9b8c66da0877b925c /cmake | |
| parent | 325726a2b60743963fe4d392061dc81da1fc01e3 (diff) | |
| download | PROJ-d68054678282c2aea509bd700aa5a4af4173827d.tar.gz PROJ-d68054678282c2aea509bd700aa5a4af4173827d.zip | |
Rename CMake infrastructure to remove 4
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Makefile.am | 14 | ||||
| -rw-r--r-- | cmake/ProjConfig.cmake (renamed from cmake/Proj4Config.cmake) | 2 | ||||
| -rw-r--r-- | cmake/ProjInstallPath.cmake (renamed from cmake/Proj4InstallPath.cmake) | 8 | ||||
| -rw-r--r-- | cmake/ProjMac.cmake (renamed from cmake/Proj4Mac.cmake) | 0 | ||||
| -rw-r--r-- | cmake/ProjSystemInfo.cmake (renamed from cmake/Proj4SystemInfo.cmake) | 2 | ||||
| -rw-r--r-- | cmake/ProjTest.cmake (renamed from cmake/Proj4Test.cmake) | 0 | ||||
| -rw-r--r-- | cmake/ProjUtilities.cmake (renamed from cmake/Proj4Utilities.cmake) | 2 | ||||
| -rw-r--r-- | cmake/ProjVersion.cmake (renamed from cmake/Proj4Version.cmake) | 3 |
8 files changed, 15 insertions, 16 deletions
diff --git a/cmake/Makefile.am b/cmake/Makefile.am index 4cf5fc7e..14ce7af6 100644 --- a/cmake/Makefile.am +++ b/cmake/Makefile.am @@ -1,12 +1,12 @@ EXTRA_DIST = CMakeLists.txt \ - Proj4InstallPath.cmake \ - Proj4SystemInfo.cmake \ - Proj4Utilities.cmake \ + ProjInstallPath.cmake \ + ProjSystemInfo.cmake \ + ProjUtilities.cmake \ proj_config.cmake.in \ - Proj4Config.cmake \ - Proj4Mac.cmake \ - Proj4Test.cmake \ - Proj4Version.cmake \ + ProjConfig.cmake \ + ProjMac.cmake \ + ProjTest.cmake \ + ProjVersion.cmake \ policies.cmake \ proj_config.cmake.in \ project-config-version.cmake.in \ diff --git a/cmake/Proj4Config.cmake b/cmake/ProjConfig.cmake index 2bc7cb38..3c5f110d 100644 --- a/cmake/Proj4Config.cmake +++ b/cmake/ProjConfig.cmake @@ -1,5 +1,5 @@ ################################################################################ -# SociConfig.cmake - CMake build configuration of SOCI library +# ProjConfig.cmake - CMake build configuration of PROJ library ################################################################################ # Copyright (C) 2010 Mateusz Loskot <mateusz@loskot.net> # diff --git a/cmake/Proj4InstallPath.cmake b/cmake/ProjInstallPath.cmake index b06777f4..72ffbac2 100644 --- a/cmake/Proj4InstallPath.cmake +++ b/cmake/ProjInstallPath.cmake @@ -15,8 +15,8 @@ endif(UNIX) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - SET(CMAKE_INSTALL_PREFIX ${DEFAULT_PROJ_ROOT_DIR} CACHE PATH "Proj.4 install - prefix" FORCE) + SET(CMAKE_INSTALL_PREFIX ${DEFAULT_PROJ_ROOT_DIR} CACHE PATH + "Proj install prefix" FORCE) ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) #TODO @@ -49,7 +49,7 @@ else() set(DEFAULT_CMAKE_SUBDIR lib/cmake/${PROJECT_NAME_LOWER}) endif() -# Locations are changeable by user to customize layout of Proj.4 installation +# Locations are changeable by user to customize layout of PROJ installation # (default values are platform-specific) set(PROJ_BIN_SUBDIR ${DEFAULT_BIN_SUBDIR} CACHE STRING "Subdirectory where executables will be installed") @@ -62,7 +62,7 @@ set(PROJ_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING set(PROJ_DOC_SUBDIR ${DEFAULT_DOC_SUBDIR} CACHE STRING "Subdirectory where doc will be installed") set(PROJ_CMAKE_SUBDIR ${DEFAULT_CMAKE_SUBDIR} CACHE STRING - "Subdirectory where cmake proj4-config file will be installed") + "Subdirectory where cmake proj-config file will be installed") # Mark *DIR variables as advanced and dedicated to use by power-users only. mark_as_advanced(PROJ_ROOT_DIR diff --git a/cmake/Proj4Mac.cmake b/cmake/ProjMac.cmake index 9032d056..9032d056 100644 --- a/cmake/Proj4Mac.cmake +++ b/cmake/ProjMac.cmake diff --git a/cmake/Proj4SystemInfo.cmake b/cmake/ProjSystemInfo.cmake index fda57edb..2c66e268 100644 --- a/cmake/Proj4SystemInfo.cmake +++ b/cmake/ProjSystemInfo.cmake @@ -1,5 +1,5 @@ ################################################################################ -# SociSystemInfo.cmake - part of CMake configuration of Proj.4 library +# ProjSystemInfo.cmake - part of CMake configuration of PROJ library # # Based on idea taken from http://code.google.com/p/softart/ project ################################################################################ diff --git a/cmake/Proj4Test.cmake b/cmake/ProjTest.cmake index ec56afd2..ec56afd2 100644 --- a/cmake/Proj4Test.cmake +++ b/cmake/ProjTest.cmake diff --git a/cmake/Proj4Utilities.cmake b/cmake/ProjUtilities.cmake index 24b61701..bde495c6 100644 --- a/cmake/Proj4Utilities.cmake +++ b/cmake/ProjUtilities.cmake @@ -1,5 +1,5 @@ ################################################################################ -# SociUtilities.cmake - part of CMake configuration of Proj4 library +# ProjUtilities.cmake - part of CMake configuration of PROJ library # # Based on BoostUtilities.cmake from CMake configuration for Boost ################################################################################ diff --git a/cmake/Proj4Version.cmake b/cmake/ProjVersion.cmake index fafaf24d..1121cd36 100644 --- a/cmake/Proj4Version.cmake +++ b/cmake/ProjVersion.cmake @@ -1,5 +1,5 @@ ################################################################################ -# Proj4Version.cmake - part of CMake configuration of Proj4 library +# ProjVersion.cmake - part of CMake configuration of PROJ library ################################################################################ # Copyright (C) 2010 Mateusz Loskot <mateusz@loskot.net> # @@ -8,7 +8,6 @@ # Macros in this module: # # proj_version - defines version information for PROJ library -# (best known as PROJ4 because MAJOR version is 4 since a very long time) ################################################################################ # Defines version information for PROJ library |