aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMike Taves <mwtoews@gmail.com>2019-03-18 23:58:41 +1300
committerMike Taves <mwtoews@gmail.com>2019-03-19 20:04:48 +1300
commit2622d3851573cd44fc7b36bfd15f07215f434d4b (patch)
tree0bd797dc0c66c52b494c7b5dfe7b45f32fecc459 /cmake
parent8cf492acb3840eff5064a2da421c143e1fd1646c (diff)
downloadPROJ-2622d3851573cd44fc7b36bfd15f07215f434d4b.tar.gz
PROJ-2622d3851573cd44fc7b36bfd15f07215f434d4b.zip
Normalize CMake with cmakelint, 2-space indent
Diffstat (limited to 'cmake')
-rw-r--r--cmake/CMakeLists.txt25
-rw-r--r--cmake/FindSqlite3.cmake61
-rw-r--r--cmake/ProjConfig.cmake40
-rw-r--r--cmake/ProjInstallPath.cmake28
-rw-r--r--cmake/ProjMac.cmake34
-rw-r--r--cmake/ProjSystemInfo.cmake18
-rw-r--r--cmake/ProjTest.cmake46
-rw-r--r--cmake/ProjUtilities.cmake45
-rw-r--r--cmake/ProjVersion.cmake13
-rw-r--r--cmake/policies.cmake6
10 files changed, 165 insertions, 151 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index da586343..61c69f7c 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -2,32 +2,33 @@
# ${INSTALL_CMAKE_DIR} and @PROJECT_ROOT_DIR@ is the relative
# path to the root from there. (Note that the whole install tree can
# be relocated.)
-file(RELATIVE_PATH PROJECT_ROOT_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKECONFIGDIR} ${CMAKE_INSTALL_PREFIX})
+file(RELATIVE_PATH PROJECT_ROOT_DIR
+ ${CMAKE_INSTALL_PREFIX}/${CMAKECONFIGDIR} ${CMAKE_INSTALL_PREFIX})
-if (CMAKE_CROSSCOMPILING)
- set (CMAKE_CROSSCOMPILING_STR "ON")
-else ()
- set (CMAKE_CROSSCOMPILING_STR "OFF")
-endif ()
+if(CMAKE_CROSSCOMPILING)
+ set(CMAKE_CROSSCOMPILING_STR "ON")
+else()
+ set(CMAKE_CROSSCOMPILING_STR "OFF")
+endif()
string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER)
-configure_file (project-config.cmake.in project-config.cmake @ONLY)
-configure_file (project-config-version.cmake.in
+configure_file(project-config.cmake.in project-config.cmake @ONLY)
+configure_file(project-config-version.cmake.in
project-config-version.cmake @ONLY)
-install (FILES
+install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/project-config.cmake"
DESTINATION "${CMAKECONFIGDIR}"
RENAME "${PROJECT_NAME_LOWER}-config.cmake")
-install (FILES
+install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/project-config-version.cmake"
DESTINATION "${CMAKECONFIGDIR}"
RENAME "${PROJECT_NAME_LOWER}-config-version.cmake")
# Make information about the cmake targets (the library and the tools)
# available.
-install (EXPORT targets
+install(EXPORT targets
FILE ${PROJECT_NAME_LOWER}-targets.cmake
DESTINATION "${CMAKECONFIGDIR}")
-install (EXPORT targets
+install(EXPORT targets
NAMESPACE ${PROJECT_NAME}::
FILE ${PROJECT_NAME_LOWER}-namespace-targets.cmake
DESTINATION "${CMAKECONFIGDIR}")
diff --git a/cmake/FindSqlite3.cmake b/cmake/FindSqlite3.cmake
index 4ac079c4..4f1d909f 100644
--- a/cmake/FindSqlite3.cmake
+++ b/cmake/FindSqlite3.cmake
@@ -12,55 +12,56 @@
# SQLITE3_LIBRARY
-# FIND_PATH and FIND_LIBRARY normally search standard locations
+# find_path and find_library normally search standard locations
# before the specified paths. To search non-standard paths first,
# FIND_* is invoked first with specified paths and NO_DEFAULT_PATH
# and then again with no specified paths to search the default
# locations. When an earlier FIND_* succeeds, subsequent FIND_*s
-# searching for the same item do nothing.
+# searching for the same item do nothing.
# try to use framework on mac
# want clean framework path, not unix compatibility path
-IF (APPLE)
- IF (CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
+if(APPLE)
+ if(CMAKE_FIND_FRAMEWORK MATCHES "FIRST"
OR CMAKE_FRAMEWORK_PATH MATCHES "ONLY"
OR NOT CMAKE_FIND_FRAMEWORK)
- SET (CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
- SET (CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
- #FIND_PATH(SQLITE3_INCLUDE_DIR SQLite3/sqlite3.h)
- FIND_LIBRARY(SQLITE3_LIBRARY SQLite3)
- IF (SQLITE3_LIBRARY)
- # FIND_PATH doesn't add "Headers" for a framework
- SET (SQLITE3_INCLUDE_DIR ${SQLITE3_LIBRARY}/Headers CACHE PATH "Path to a file.")
- ENDIF (SQLITE3_LIBRARY)
- SET (CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
- ENDIF ()
-ENDIF (APPLE)
+ set(CMAKE_FIND_FRAMEWORK_save ${CMAKE_FIND_FRAMEWORK} CACHE STRING "" FORCE)
+ set(CMAKE_FIND_FRAMEWORK "ONLY" CACHE STRING "" FORCE)
+ #find_path(SQLITE3_INCLUDE_DIR SQLite3/sqlite3.h)
+ find_library(SQLITE3_LIBRARY SQLite3)
+ if(SQLITE3_LIBRARY)
+ # find_path doesn't add "Headers" for a framework
+ set(SQLITE3_INCLUDE_DIR ${SQLITE3_LIBRARY}/Headers
+ CACHE PATH "Path to a file.")
+ endif()
+ set(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_save} CACHE STRING "" FORCE)
+ endif()
+endif()
-FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
+find_path(SQLITE3_INCLUDE_DIR sqlite3.h
"$ENV{LIB_DIR}/include"
"$ENV{LIB_DIR}/include/sqlite"
"$ENV{INCLUDE}"
)
-FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3_i sqlite3 PATHS
+find_library(SQLITE3_LIBRARY NAMES sqlite3_i sqlite3 PATHS
"$ENV{LIB_DIR}/lib"
"$ENV{LIB}/lib"
- )
+)
-IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
- SET(SQLITE3_FOUND TRUE)
-ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
+if(SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
+ set(SQLITE3_FOUND TRUE)
+endif()
-IF (SQLITE3_FOUND)
- IF (NOT SQLITE3_FIND_QUIETLY)
- MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
- ENDIF (NOT SQLITE3_FIND_QUIETLY)
+if(SQLITE3_FOUND)
+ if(NOT SQLITE3_FIND_QUIETLY)
+ message(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
+ endif()
-ELSE (SQLITE3_FOUND)
+else()
- IF (SQLITE3_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find Sqlite3")
- ENDIF (SQLITE3_FIND_REQUIRED)
+ if(SQLITE3_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find Sqlite3")
+ endif()
-ENDIF (SQLITE3_FOUND)
+endif()
diff --git a/cmake/ProjConfig.cmake b/cmake/ProjConfig.cmake
index ada827ea..f9593c8d 100644
--- a/cmake/ProjConfig.cmake
+++ b/cmake/ProjConfig.cmake
@@ -7,27 +7,27 @@
# (See accompanying file LICENSE_1_0.txt or copy at
# https://www.boost.org/LICENSE_1_0.txt)
################################################################################
-include (CheckIncludeFiles)
-include (CheckLibraryExists)
-include (CheckFunctionExists)
+include(CheckIncludeFiles)
+include(CheckLibraryExists)
+include(CheckFunctionExists)
# check needed include file
-check_include_files (dlfcn.h HAVE_DLFCN_H)
-check_include_files (inttypes.h HAVE_INTTYPES_H)
-check_include_files (jni.h HAVE_JNI_H)
-check_include_files (memory.h HAVE_MEMORY_H)
-check_include_files (stdint.h HAVE_STDINT_H)
-check_include_files (stdlib.h HAVE_STDLIB_H)
-check_include_files (string.h HAVE_STRING_H)
-check_include_files (sys/stat.h HAVE_SYS_STAT_H)
-check_include_files (sys/types.h HAVE_SYS_TYPES_H)
-check_include_files (unistd.h HAVE_UNISTD_H)
+check_include_files(dlfcn.h HAVE_DLFCN_H)
+check_include_files(inttypes.h HAVE_INTTYPES_H)
+check_include_files(jni.h HAVE_JNI_H)
+check_include_files(memory.h HAVE_MEMORY_H)
+check_include_files(stdint.h HAVE_STDINT_H)
+check_include_files(stdlib.h HAVE_STDLIB_H)
+check_include_files(string.h HAVE_STRING_H)
+check_include_files(sys/stat.h HAVE_SYS_STAT_H)
+check_include_files(sys/types.h HAVE_SYS_TYPES_H)
+check_include_files(unistd.h HAVE_UNISTD_H)
check_include_files("stdlib.h;stdarg.h;string.h;float.h" STDC_HEADERS)
-CHECK_FUNCTION_EXISTS(localeconv HAVE_LOCALECONV)
+check_function_exists(localeconv HAVE_LOCALECONV)
-# check libm need on unix
-check_library_exists(m ceil "" HAVE_LIBM)
+# check libm need on unix
+check_library_exists(m ceil "" HAVE_LIBM)
set(PACKAGE "proj")
set(PACKAGE_BUGREPORT "https://github.com/OSGeo/proj.4/issues")
@@ -41,10 +41,10 @@ set(PACKAGE_VERSION "${${PROJECT_INTERN_NAME}_VERSION}")
# as this is within CMake's C_INCLUDES / CXX_INCLUDES
set(AUTOCONF_PROJ_CONFIG_H "${CMAKE_SOURCE_DIR}/src/proj_config.h")
if(EXISTS ${AUTOCONF_PROJ_CONFIG_H})
- message(WARNING "Autoconf's ${AUTOCONF_PROJ_CONFIG_H} may interfere "
- "with this CMake build. Run 'make distclean' in the "
- "source directory before CMake's build.")
+ message(WARNING
+ "Autoconf's ${AUTOCONF_PROJ_CONFIG_H} may interfere with this "
+ "CMake build. Run 'make distclean' in the source directory "
+ "before CMake's build.")
endif()
configure_file(cmake/proj_config.cmake.in src/proj_config.h)
-
diff --git a/cmake/ProjInstallPath.cmake b/cmake/ProjInstallPath.cmake
index b42f927f..e74519b1 100644
--- a/cmake/ProjInstallPath.cmake
+++ b/cmake/ProjInstallPath.cmake
@@ -11,13 +11,13 @@ if(WIN32)
endif()
if(UNIX)
set(DEFAULT_PROJ_ROOT_DIR "/usr/local/")
-endif(UNIX)
+endif()
-IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- SET(CMAKE_INSTALL_PREFIX ${DEFAULT_PROJ_ROOT_DIR} CACHE PATH
- "Proj install prefix" FORCE)
-ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ set(CMAKE_INSTALL_PREFIX ${DEFAULT_PROJ_ROOT_DIR}
+ CACHE PATH "Proj install prefix" FORCE)
+endif()
#TODO
# for data install testing the PROJ_LIB envVar
@@ -58,13 +58,15 @@ set(PROJ_CMAKE_SUBDIR ${DEFAULT_CMAKE_SUBDIR} CACHE STRING
"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
- PROJ_BIN_SUBDIR
- PROJ_LIB_SUBDIR
- PROJ_INCLUDE_SUBDIR
- PROJ_DATA_SUBDIR
- PROJ_DOC_SUBDIR
- PROJ_CMAKE_SUBDIR )
+mark_as_advanced(
+ PROJ_ROOT_DIR
+ PROJ_BIN_SUBDIR
+ PROJ_LIB_SUBDIR
+ PROJ_INCLUDE_SUBDIR
+ PROJ_DATA_SUBDIR
+ PROJ_DOC_SUBDIR
+ PROJ_CMAKE_SUBDIR
+)
set(DEFAULT_BINDIR "${PROJ_BIN_SUBDIR}")
set(DEFAULT_LIBDIR "${PROJ_LIB_SUBDIR}")
@@ -72,5 +74,3 @@ set(DEFAULT_DATADIR "${PROJ_DATA_SUBDIR}")
set(DEFAULT_DOCDIR "${PROJ_DOC_SUBDIR}")
set(DEFAULT_INCLUDEDIR "${PROJ_INCLUDE_SUBDIR}")
set(DEFAULT_CMAKEDIR "${PROJ_CMAKE_SUBDIR}")
-
-
diff --git a/cmake/ProjMac.cmake b/cmake/ProjMac.cmake
index 9032d056..0de87941 100644
--- a/cmake/ProjMac.cmake
+++ b/cmake/ProjMac.cmake
@@ -1,23 +1,29 @@
if(APPLE)
-set(FRAMEWORKDIR "Library/Frameworks" CACHE PATH "the path to install framework")
- set(BUNDLEDIR "Applications/OSGEO" CACHE PATH "the path to install bundle")
- file(RELATIVE_PATH BUNDLE_FRAME_REL_PATH_AAA "/${FRAMEWORKDIR}" "/aaa")
+ set(FRAMEWORKDIR "Library/Frameworks" CACHE PATH
+ "the path to install framework")
+ set(BUNDLEDIR "Applications/OSGEO" CACHE PATH
+ "the path to install bundle")
+ file(RELATIVE_PATH BUNDLE_FRAME_REL_PATH_AAA "/${FRAMEWORKDIR}" "/aaa")
string(LENGTH ${BUNDLE_FRAME_REL_PATH_AAA} AAA_LENGTH)
math(EXPR RELATIVE_PATH_LENGTH "${AAA_LENGTH}-4")
- string(SUBSTRING ${BUNDLE_FRAME_REL_PATH_AAA} 0 ${RELATIVE_PATH_LENGTH} BUNDLE_FRAME_REL_PATH)
- set(PROJ_INSTALL_NAME_DIR "@executable_path/${BUNDLE_FRAME_REL_PATH}/${FRAMEWORKDIR}" )
-else(APPLE)
+ string(SUBSTRING ${BUNDLE_FRAME_REL_PATH_AAA}
+ 0 ${RELATIVE_PATH_LENGTH} BUNDLE_FRAME_REL_PATH)
+ set(PROJ_INSTALL_NAME_DIR
+ "@executable_path/${BUNDLE_FRAME_REL_PATH}/${FRAMEWORKDIR}")
+else()
set(FRAMEWORKDIR "")
set(BUNDLEDIR "")
set(PROJ_INSTALL_NAME_DIR "")
-endif(APPLE)
+endif()
-set(PROJ_RESOURCES "" )
+set(PROJ_RESOURCES "")
if(APPLE)
- option(BUILD_FRAMEWORKS_AND_BUNDLE "if set to ON, build a library framework and application bundle, otherwise install classical UNIX bin/lib" OFF )
- set(DEFAULT_BINDIR ${BUNDLEDIR})
- boost_report_value(BUNDLEDIR)
- boost_report_value(PROJ_INSTALL_NAME_DIR)
- boost_report_value(FRAMEWORKDIR)
-endif(APPLE)
+ option(BUILD_FRAMEWORKS_AND_BUNDLE
+ "if set to ON, build a library framework and application bundle, \
+otherwise install classical UNIX bin/lib" OFF)
+ set(DEFAULT_BINDIR ${BUNDLEDIR})
+ boost_report_value(BUNDLEDIR)
+ boost_report_value(PROJ_INSTALL_NAME_DIR)
+ boost_report_value(FRAMEWORKDIR)
+endif()
diff --git a/cmake/ProjSystemInfo.cmake b/cmake/ProjSystemInfo.cmake
index 18a80fa7..4265bacf 100644
--- a/cmake/ProjSystemInfo.cmake
+++ b/cmake/ProjSystemInfo.cmake
@@ -56,18 +56,18 @@ if(WIN32)
if(MSVC_VERSION GREATER 1900 AND MSVC_VERSION LESS 1920) # CMake 3.8+
set(PROJ_COMPILER_NAME "msvc-14.1") #Visual Studio 2017
endif()
- endif(MSVC)
-
+ endif()
+
if(MINGW)
set(PROJ_COMPILER_NAME "mingw-${GCC_VERSION}")
- endif( MINGW )
-
+ endif()
+
if(CMAKE_GENERATOR MATCHES "Win64")
set(PROJ_PLATFORM_NAME "x64")
else()
set(PROJ_PLATFORM_NAME "win32")
endif()
-endif(WIN32)
+endif() # WIN32
if(UNIX)
set(PROJ_COMPILER_NAME "gcc-${GCC_VERSION}")
@@ -76,14 +76,16 @@ if(UNIX)
else()
set(PROJ_PLATFORM_NAME "x86")
endif()
-endif(UNIX)
+endif()
if(NOT PROJ_COMPILER_NAME)
colormsg(_RED_ "WARNING:")
- colormsg(RED "Could not determine compiler toolset name to set PROJ_COMPILER_NAME variable.")
+ colormsg(RED "Could not determine compiler toolset name to set \
+PROJ_COMPILER_NAME variable.")
endif()
if(NOT PROJ_COMPILER_NAME)
colormsg(_RED_ "WARNING:")
- colormsg(RED "Could not determine platform name to set PROJ_COMPILER_NAME variable.")
+ colormsg(RED "Could not determine platform name to set \
+PROJ_COMPILER_NAME variable.")
endif()
diff --git a/cmake/ProjTest.cmake b/cmake/ProjTest.cmake
index 46c4e515..7404b59d 100644
--- a/cmake/ProjTest.cmake
+++ b/cmake/ProjTest.cmake
@@ -8,27 +8,27 @@ function(proj_add_test_script_sh SH_NAME BIN_USE)
set(TEST_OK 1)
if(ARGV2)
- set(TEST_OK 0)
- set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/data/${ARGV2})
- if(EXISTS ${GRID_FULLNAME})
- set(TEST_OK 1)
- endif(EXISTS ${GRID_FULLNAME})
- endif(ARGV2)
-
- if( CMAKE_VERSION VERSION_LESS 2.8.4 )
- set(TEST_OK 0)
- message(STATUS "test with bash script need a cmake version >= 2.8.4")
+ set(TEST_OK 0)
+ set(GRID_FULLNAME ${PROJECT_SOURCE_DIR}/data/${ARGV2})
+ if(EXISTS ${GRID_FULLNAME})
+ set(TEST_OK 1)
+ endif()
+ endif()
+
+ if(CMAKE_VERSION VERSION_LESS 2.8.4)
+ set(TEST_OK 0)
+ message(STATUS "test with bash script need a cmake version >= 2.8.4")
endif()
if(${TEST_OK})
- add_test( NAME "${testname}"
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data
- COMMAND ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME}
- ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
- )
- endif(${TEST_OK})
-
- endif(UNIX)
+ add_test(NAME "${testname}"
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/data
+ COMMAND ${PROJECT_SOURCE_DIR}/test/cli/${SH_NAME}
+ ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${${BIN_USE}}
+ )
+ endif()
+
+ endif()
endfunction()
@@ -36,10 +36,10 @@ function(proj_add_gie_test TESTNAME TESTCASE)
set(GIE_BIN "gie")
set(TESTFILE ${CMAKE_SOURCE_DIR}/test/${TESTCASE})
- add_test( NAME ${TESTNAME}
- WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
- COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN}
- ${TESTFILE}
- )
+ add_test(NAME ${TESTNAME}
+ WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/test
+ COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${GIE_BIN}
+ ${TESTFILE}
+ )
endfunction()
diff --git a/cmake/ProjUtilities.cmake b/cmake/ProjUtilities.cmake
index 72373719..1a2b6052 100644
--- a/cmake/ProjUtilities.cmake
+++ b/cmake/ProjUtilities.cmake
@@ -5,7 +5,7 @@
################################################################################
# Copyright (C) 2007 Douglas Gregor <doug.gregor@gmail.com>
# Copyright (C) 2007 Troy Straszheim
-# Copyright (C) 2010 Mateusz Loskot <mateusz@loskot.net>
+# Copyright (C) 2010 Mateusz Loskot <mateusz@loskot.net>
#
# Distributed under the Boost Software License, Version 1.0.
# See accompanying file LICENSE_1_0.txt or copy at
@@ -13,7 +13,7 @@
################################################################################
# Macros in this module:
#
-# proj_target_output_name:
+# proj_target_output_name:
#
################################################################################
@@ -21,8 +21,8 @@
# A big shout out to the cmake gurus @ compiz
#
-function (colormsg)
- string (ASCII 27 _escape)
+function(colormsg)
+ string(ASCII 27 _escape)
set(WHITE "29")
set(GRAY "30")
set(RED "31")
@@ -32,7 +32,7 @@ function (colormsg)
set(MAG "35")
set(CYAN "36")
- foreach (color WHITE GRAY RED GREEN YELLOW BLUE MAG CYAN)
+ foreach(color WHITE GRAY RED GREEN YELLOW BLUE MAG CYAN)
set(HI${color} "1\;${${color}}")
set(LO${color} "2\;${${color}}")
set(_${color}_ "4\;${${color}}")
@@ -43,14 +43,14 @@ function (colormsg)
set(str "")
set(coloron FALSE)
foreach(arg ${ARGV})
- if (NOT ${${arg}} STREQUAL "")
- if (CMAKE_COLOR_MAKEFILE)
+ if(NOT ${${arg}} STREQUAL "")
+ if(CMAKE_COLOR_MAKEFILE)
set(str "${str}${_escape}[${${arg}}m")
set(coloron TRUE)
endif()
else()
set(str "${str}${arg}")
- if (coloron)
+ if(coloron)
set(str "${str}${_escape}[0m")
set(coloron FALSE)
endif()
@@ -60,19 +60,19 @@ function (colormsg)
message(STATUS ${str})
endfunction()
-# colormsg("Colors:"
-# WHITE "white" GRAY "gray" GREEN "green"
-# RED "red" YELLOW "yellow" BLUE "blue" MAG "mag" CYAN "cyan"
-# _WHITE_ "white" _GRAY_ "gray" _GREEN_ "green"
-# _RED_ "red" _YELLOW_ "yellow" _BLUE_ "blue" _MAG_ "mag" _CYAN_ "cyan"
-# _HIWHITE_ "white" _HIGRAY_ "gray" _HIGREEN_ "green"
-# _HIRED_ "red" _HIYELLOW_ "yellow" _HIBLUE_ "blue" _HIMAG_ "mag" _HICYAN_ "cyan"
-# HIWHITE "white" HIGRAY "gray" HIGREEN "green"
-# HIRED "red" HIYELLOW "yellow" HIBLUE "blue" HIMAG "mag" HICYAN "cyan"
+# colormsg("Colors:"
+# WHITE "white" GRAY "gray" GREEN "green"
+# RED "red" YELLOW "yellow" BLUE "blue" MAG "mag" CYAN "cyan"
+# _WHITE_ "white" _GRAY_ "gray" _GREEN_ "green"
+# _RED_ "red" _YELLOW_ "yellow" _BLUE_ "blue" _MAG_ "mag" _CYAN_ "cyan"
+# _HIWHITE_ "white" _HIGRAY_ "gray" _HIGREEN_ "green"
+# _HIRED_ "red" _HIYELLOW_ "yellow" _HIBLUE_ "blue" _HIMAG_ "mag"
+# _HICYAN_ "cyan" HIWHITE "white" HIGRAY "gray" HIGREEN "green"
+# HIRED "red" HIYELLOW "yellow" HIBLUE "blue" HIMAG "mag" HICYAN "cyan"
# "right?")
#
-# pretty-prints the value of a variable so that the
+# pretty-prints the value of a variable so that the
# equals signs align
#
@@ -82,7 +82,7 @@ function(boost_report_value NAME)
#message(STATUS "boost_report_value: NAME=${NAME} (${varlen})")
#message(STATUS "boost_report_value: \${NAME}=${${NAME}}")
math(EXPR padding_len 40-${varlen})
- string(SUBSTRING " "
+ string(SUBSTRING " "
0 ${padding_len} varpadding)
colormsg("${NAME}${varpadding} = ${${NAME}}")
endfunction()
@@ -98,12 +98,13 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME)
endif()
if(NOT DEFINED ${PROJECT_INTERN_NAME}_VERSION)
- message(SEND_ERROR "Error, the variable ${${PROJECT_INTERN_NAME}_VERSION} is not defined!")
+ message(SEND_ERROR
+ "Error, the variable ${${PROJECT_INTERN_NAME}_VERSION} is not defined!")
endif()
# On Windows, ABI version is specified using binary file name suffix.
# On Unix, suffix is empty and SOVERSION is used instead.
- if (WIN32)
+ if(WIN32)
string(LENGTH "${${PROJECT_INTERN_NAME}_ABI_VERSION}" abilen)
if(abilen GREATER 0)
set(SUFFIX "_${${PROJECT_INTERN_NAME}_ABI_VERSION}")
@@ -111,4 +112,4 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME)
endif()
set(${OUTPUT_NAME} ${TARGET_NAME}${SUFFIX} PARENT_SCOPE)
-endfunction() \ No newline at end of file
+endfunction()
diff --git a/cmake/ProjVersion.cmake b/cmake/ProjVersion.cmake
index f761dc47..5614d44d 100644
--- a/cmake/ProjVersion.cmake
+++ b/cmake/ProjVersion.cmake
@@ -6,7 +6,7 @@
# Distributed under the Boost Software License, Version 1.0
################################################################################
# Macros in this module:
-#
+#
# proj_version - defines version information for PROJ library
################################################################################
@@ -33,18 +33,21 @@ macro(proj_version)
# Set VERSION string
set(${PROJECT_INTERN_NAME}_VERSION
- "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}.${${PROJECT_INTERN_NAME}_VERSION_MINOR}.${${PROJECT_INTERN_NAME}_VERSION_PATCH}")
+ "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}.\
+${${PROJECT_INTERN_NAME}_VERSION_MINOR}.\
+${${PROJECT_INTERN_NAME}_VERSION_PATCH}")
- # Set ABI version string used to name binary output
+ # Set ABI version string used to name binary output
# On Windows, ABI version is specified using binary file name suffix.
if(WIN32)
set(${PROJECT_INTERN_NAME}_ABI_VERSION
- "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}_${${PROJECT_INTERN_NAME}_VERSION_MINOR}")
+ "${${PROJECT_INTERN_NAME}_VERSION_MAJOR}_\
+${${PROJECT_INTERN_NAME}_VERSION_MINOR}")
endif()
message(STATUS "")
boost_report_value(${PROJECT_INTERN_NAME}_VERSION)
if(WIN32)
boost_report_value(${PROJECT_INTERN_NAME}_ABI_VERSION)
- endif(WIN32)
+ endif()
endmacro()
diff --git a/cmake/policies.cmake b/cmake/policies.cmake
index e1bfd53b..35d0545c 100644
--- a/cmake/policies.cmake
+++ b/cmake/policies.cmake
@@ -1,4 +1,4 @@
-if (CMAKE_MAJOR_VERSION GREATER 2)
- cmake_policy(SET CMP0042 NEW) # osx rpath
- cmake_policy(SET CMP0011 NEW) # policy setting
+if(CMAKE_MAJOR_VERSION GREATER 2)
+ cmake_policy(SET CMP0042 NEW) # osx rpath
+ cmake_policy(SET CMP0011 NEW) # policy setting
endif()