Merge pull request #901 from mwtoews/dot4

Rename CMake infrastructure to remove 4

10 files changed, 31 insertions, 33 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a9ca82d4..7a02d247 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 #################################################################################
 #
-# This file is part of CMake configuration for PROJ4 library (inspired from SOCI
+# This file is part of CMake configuration for PROJ library (inspired from SOCI
 # CMake,  Copyright (C) 2009-2010 Mateusz Loskot <mateusz@loskot.net> )
 #
 # Copyright (C) 2011 Nicolas David <nicolas.david@ign.fr>
@@ -11,7 +11,7 @@
 #################################################################################
 cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 
-# proj4 is an ANSI C project
+# For historic reasons, the CMake PROJECT-NAME is PROJ4
 project(PROJ4 C)
 set(PROJECT_INTERN_NAME PROJ)
 
@@ -48,13 +48,12 @@ if (CMAKE_C_COMPILER_ID STREQUAL "Intel")
 endif ()
 
 #################################################################################
-# PROJ4 CMake modules
+# PROJ CMake modules
 #################################################################################
 # Path to additional CMake modules
 set(CMAKE_MODULE_PATH ${PROJ4_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-set(CMAKE_MODULE_PATH ${PROJ4_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})
 
-include(Proj4Utilities)
+include(ProjUtilities)
 
 message(STATUS "")
 colormsg(_HIBLUE_ "Configuring PROJ:")
@@ -62,7 +61,7 @@ colormsg(_HIBLUE_ "Configuring PROJ:")
 #################################################################################
 #PROJ version information
 #################################################################################
-include(Proj4Version)
+include(ProjVersion)
 proj_version(MAJOR 5 MINOR 0 PATCH 0)
 set(PROJ_API_VERSION "13")
 set(PROJ_BUILD_VERSION "13.0.1")
@@ -70,9 +69,9 @@ set(PROJ_BUILD_VERSION "13.0.1")
 #################################################################################
 # Build features and variants
 #################################################################################
-include(Proj4SystemInfo)
-include(Proj4Config)
-include(Proj4Mac)
+include(ProjSystemInfo)
+include(ProjConfig)
+include(ProjMac)
 include(policies)
 
 #################################################################################
@@ -126,13 +125,13 @@ if (MSVC OR CMAKE_CONFIGURATION_TYPES)
   set (CMAKE_DEBUG_POSTFIX _d)
 endif ()
 
-option(PROJ4_TESTS "Enable build of collection of PROJ4 tests" ON)
-boost_report_value(PROJ4_TESTS)
-if(PROJ4_TESTS)
+option(PROJ_TESTS "Enable build of collection of PROJ tests" ON)
+boost_report_value(PROJ_TESTS)
+if(PROJ_TESTS)
     include(CTest)
     enable_testing()
-endif(PROJ4_TESTS)
-include(Proj4Test)
+endif(PROJ_TESTS)
+include(ProjTest)
 
 # Put the libraries and binaries that get built into directories at the
 # top of the build tree rather than in hard-to-find leaf
@@ -146,7 +145,7 @@ link_directories(${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
 #################################################################################
 # Installation
 #################################################################################
-include(Proj4InstallPath)
+include(ProjInstallPath)
 set(BINDIR "${DEFAULT_BINDIR}" CACHE PATH "The directory to install binaries into.")
 set(LIBDIR "${DEFAULT_LIBDIR}" CACHE PATH "The directory to install libraries into.")
 set(DATADIR "${DEFAULT_DATADIR}" CACHE PATH "The directory to install data files into.")
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..79ecf96b 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
 ################################################################################
@@ -378,7 +378,7 @@ endmacro()
 
 #
 # Generates output name for given target depending on platform and version.
-# For instance, on Windows, libraries get ABI version suffix soci_coreXY.{dll|lib}.
+# For instance, on Windows, libraries get ABI version suffix proj_X_Y.{dll|lib}.
 #
 
 function(proj_target_output_name TARGET_NAME OUTPUT_NAME)
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
diff --git a/src/bin_nad2bin.cmake b/src/bin_nad2bin.cmake
index 57cbfe21..33bd4d0b 100644
--- a/src/bin_nad2bin.cmake
+++ b/src/bin_nad2bin.cmake
@@ -1,5 +1,5 @@
 if(WIN32 AND BUILD_LIBPROJ_SHARED)
-    message(warning " nad2nad can't be build with a DLL proj4 library you need a static lib")
+    message(warning " nad2nad can't be build with a DLL proj library you need a static lib")
 endif(WIN32 AND BUILD_LIBPROJ_SHARED)