aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/CMakeLists.txt4
-rw-r--r--cmake/project-config-version.cmake.in6
-rw-r--r--cmake/project-config.cmake.in29
3 files changed, 21 insertions, 18 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index dcb0a61a..742da0e9 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -3,14 +3,14 @@
# path to the root from there. (Note that the whole install tree can
# be relocated.)
if (NOT WIN32)
- set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_INTERN_NAME}")
+ set (INSTALL_CMAKE_DIR "share/cmake/${PROJECT_NAME}")
set (PROJECT_ROOT_DIR "../../..")
else ()
set (INSTALL_CMAKE_DIR "cmake")
set (PROJECT_ROOT_DIR "..")
endif ()
-string(TOLOWER "${PROJECT_INTERN_NAME}" PROJECT_NAME_LOWER)
+string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
configure_file (project-config.cmake.in project-config.cmake @ONLY)
configure_file (project-config-version.cmake.in
project-config-version.cmake @ONLY)
diff --git a/cmake/project-config-version.cmake.in b/cmake/project-config-version.cmake.in
index 5d57ee15..ce2820cb 100644
--- a/cmake/project-config-version.cmake.in
+++ b/cmake/project-config-version.cmake.in
@@ -1,16 +1,16 @@
-# Version checking for @PROJECT_INTERN_NAME@
+# Version checking for @PROJECT_NAME@
set (PACKAGE_VERSION "@PROJ_VERSION@")
set (PACKAGE_VERSION_MAJOR "@PROJ_VERSION_MAJOR@")
set (PACKAGE_VERSION_MINOR "@PROJ_VERSION_MINOR@")
set (PACKAGE_VERSION_PATCH "@PROJ_VERSION_PATCH@")
-if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_INTERN_NAME@")
+if (NOT PACKAGE_FIND_NAME STREQUAL "@PROJECT_NAME@")
# Check package name (in particular, because of the way cmake finds
# package config files, the capitalization could easily be "wrong").
# This is necessary to ensure that the automatically generated
# variables, e.g., <package>_FOUND, are consistently spelled.
- set (REASON "package = @PROJECT_INTERN_NAME@, NOT ${PACKAGE_FIND_NAME}")
+ set (REASON "package = @PROJECT_NAME@, NOT ${PACKAGE_FIND_NAME}")
set (PACKAGE_VERSION_UNSUITABLE TRUE)
elseif (NOT (APPLE OR (NOT DEFINED CMAKE_SIZEOF_VOID_P) OR
CMAKE_SIZEOF_VOID_P EQUAL @CMAKE_SIZEOF_VOID_P@))
diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in
index 6110dc61..9a52b3b5 100644
--- a/cmake/project-config.cmake.in
+++ b/cmake/project-config.cmake.in
@@ -1,28 +1,31 @@
-# Configure @PROJECT_INTERN_NAME@
+# Configure @PROJECT_NAME@
#
# Set
-# @PROJECT_INTERN_NAME@_FOUND = 1
-# @PROJECT_INTERN_NAME@_INCLUDE_DIRS = /usr/local/include
-# @PROJECT_INTERN_NAME@_LIBRARIES = proj
-# @PROJECT_INTERN_NAME@_LIBRARY_DIRS = /usr/local/lib
-# @PROJECT_INTERN_NAME@_BINARY_DIRS = /usr/local/bin
-# @PROJECT_INTERN_NAME@_VERSION = 4.9.1 (for example)
+# @PROJECT_NAME@_FOUND = 1
+# @PROJECT_NAME@_INCLUDE_DIRS = /usr/local/include
+# @PROJECT_NAME@_LIBRARIES = proj
+# @PROJECT_NAME@_LIBRARY_DIRS = /usr/local/lib
+# @PROJECT_NAME@_BINARY_DIRS = /usr/local/bin
+# @PROJECT_NAME@_VERSION = 4.9.1 (for example)
message (STATUS "Reading ${CMAKE_CURRENT_LIST_FILE}")
-# @PROJECT_INTERN_NAME@_VERSION is set by version file
+# @PROJECT_NAME@_VERSION is set by version file
message (STATUS
- "@PROJECT_INTERN_NAME@ configuration, version ${@PROJECT_INTERN_NAME@_VERSION}")
+ "@PROJECT_NAME@ configuration, version ${@PROJECT_NAME@_VERSION}")
# Tell the user project where to find our headers and libraries
get_filename_component (_DIR ${CMAKE_CURRENT_LIST_FILE} PATH)
get_filename_component (_ROOT "${_DIR}/@PROJECT_ROOT_DIR@" ABSOLUTE)
-set (@PROJECT_INTERN_NAME@_INCLUDE_DIRS "${_ROOT}/@INCLUDEDIR@")
-set (@PROJECT_INTERN_NAME@_LIBRARY_DIRS "${_ROOT}/@LIBDIR@")
-set (@PROJECT_INTERN_NAME@_BINARY_DIRS "${_ROOT}/@BINDIR@")
+set (@PROJECT_NAME@_INCLUDE_DIRS "${_ROOT}/@INCLUDEDIR@")
+set (@PROJECT_NAME@_LIBRARY_DIRS "${_ROOT}/@LIBDIR@")
+set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/@BINDIR@")
-set (@PROJECT_INTERN_NAME@_LIBRARIES proj)
+set (@PROJECT_NAME@_LIBRARIES proj)
# Read in the exported definition of the library
include ("${_DIR}/@PROJECT_NAME_LOWER@-targets.cmake")
unset (_ROOT)
unset (_DIR)
+
+# For backward compatibility with old releases of libgeotiff
+set (@PROJECT_NAME@_INCLUDE_DIR ${@PROJECT_NAME@_INCLUDE_DIRS})