Merge pull request #1330 from mwtoews/cmake

Normalize CMake with cmakelint, 2-space indent

2 files changed, 74 insertions, 65 deletions

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 3032f4bd..8f3965f2 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,17 +2,19 @@
 # files containing dictionary of useful projection
 #
 
-set(PROJ_DICTIONARY  null
-                     world
-                     other.extra
-                     nad27
-                     GL27
-                     nad83
-                     nad.lst
-                     CH
-                     ITRF2000
-                     ITRF2008
-                     ITRF2014 )
+set(PROJ_DICTIONARY
+  null
+  world
+  other.extra
+  nad27
+  GL27
+  nad83
+  nad.lst
+  CH
+  ITRF2000
+  ITRF2008
+  ITRF2014
+)
 
 #
 # gridshift file
@@ -26,40 +28,45 @@ set(ALL_SQL_IN "${CMAKE_CURRENT_BINARY_DIR}/all.sql.in")
 set(PROJ_DB "${CMAKE_CURRENT_BINARY_DIR}/proj.db")
 include(sql_filelist.cmake)
 
-add_custom_command(OUTPUT ${ALL_SQL_IN}
-    COMMAND ${CMAKE_COMMAND} "-DALL_SQL_IN=${ALL_SQL_IN}"
-                             -P "${CMAKE_CURRENT_SOURCE_DIR}/generate_all_sql_in.cmake"
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    DEPENDS ${SQL_FILES}
-    COMMENT "Generating all.sql.in"
-    VERBATIM
+add_custom_command(
+  OUTPUT ${ALL_SQL_IN}
+  COMMAND ${CMAKE_COMMAND} "-DALL_SQL_IN=${ALL_SQL_IN}"
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/generate_all_sql_in.cmake"
+  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+  DEPENDS ${SQL_FILES}
+  COMMENT "Generating all.sql.in"
+  VERBATIM
 )
 
 add_custom_target(generate_all_sql_in ALL DEPENDS ${ALL_SQL_IN})
 
-add_custom_command(OUTPUT ${PROJ_DB}
-    COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJ_DB}
-    COMMAND ${EXE_SQLITE3} -init ${ALL_SQL_IN} ${PROJ_DB} .quit
-    # note: we didn't port yet the foreign_key_check done in Makefile.am
-    DEPENDS generate_all_sql_in ${ALL_SQL_IN}
-    COMMENT "Generating proj.db"
-    VERBATIM
+add_custom_command(
+  OUTPUT ${PROJ_DB}
+  COMMAND ${CMAKE_COMMAND} -E remove -f ${PROJ_DB}
+  COMMAND ${EXE_SQLITE3} -init ${ALL_SQL_IN} ${PROJ_DB} .quit
+  # note: we didn't port yet the foreign_key_check done in Makefile.am
+  DEPENDS generate_all_sql_in ${ALL_SQL_IN}
+  COMMENT "Generating proj.db"
+  VERBATIM
 )
 
 add_custom_target(generate_proj_db ALL DEPENDS ${PROJ_DB})
 
 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
-    foreach(FILE ${PROJ_DICTIONARY}
-                 ${GRIDSHIFT_FILES})
-        configure_file(${FILE} ${FILE} COPYONLY)
-    endforeach()
+  foreach(FILE ${PROJ_DICTIONARY} ${GRIDSHIFT_FILES})
+    configure_file(${FILE} ${FILE} COPYONLY)
+  endforeach()
 endif()
 
 #
 #install
 #
-set(ALL_DATA_FILE ${PROJ_DICTIONARY}
-                  ${GRIDSHIFT_FILES}
-                  ${PROJ_DB})
-install(FILES ${ALL_DATA_FILE}
-        DESTINATION ${DATADIR})
+set(ALL_DATA_FILE
+  ${PROJ_DICTIONARY}
+  ${GRIDSHIFT_FILES}
+  ${PROJ_DB}
+)
+install(
+  FILES ${ALL_DATA_FILE}
+  DESTINATION ${DATADIR}
+)
diff --git a/data/sql_filelist.cmake b/data/sql_filelist.cmake
index b9054d23..0c3c2ab3 100644
--- a/data/sql_filelist.cmake
+++ b/data/sql_filelist.cmake
@@ -1,32 +1,34 @@
 set(SQL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sql")
-set(SQL_FILES     "${SQL_DIR}/begin.sql"
-                  "${SQL_DIR}/proj_db_table_defs.sql"
-                  "${SQL_DIR}/conversion_triggers.sql"
-                  "${SQL_DIR}/metadata.sql"
-                  "${SQL_DIR}/unit_of_measure.sql"
-                  "${SQL_DIR}/area.sql"
-                  "${SQL_DIR}/coordinate_system.sql"
-                  "${SQL_DIR}/axis.sql"
-                  "${SQL_DIR}/ellipsoid.sql"
-                  "${SQL_DIR}/prime_meridian.sql"
-                  "${SQL_DIR}/geodetic_datum.sql"
-                  "${SQL_DIR}/vertical_datum.sql"
-                  "${SQL_DIR}/conversion.sql"
-                  "${SQL_DIR}/geodetic_crs.sql"
-                  "${SQL_DIR}/projected_crs.sql"
-                  "${SQL_DIR}/vertical_crs.sql"
-                  "${SQL_DIR}/compound_crs.sql"
-                  "${SQL_DIR}/helmert_transformation.sql"
-                  "${SQL_DIR}/grid_transformation.sql"
-                  "${SQL_DIR}/grid_transformation_custom.sql"
-                  "${SQL_DIR}/other_transformation.sql"
-                  "${SQL_DIR}/concatenated_operation.sql"
-                  "${SQL_DIR}/alias_name.sql"
-                  "${SQL_DIR}/supersession.sql"
-                  "${SQL_DIR}/deprecation.sql"
-                  "${SQL_DIR}/esri.sql"
-                  "${SQL_DIR}/ignf.sql"
-                  "${SQL_DIR}/grid_alternatives.sql"
-                  "${SQL_DIR}/grid_alternatives_generated.sql"
-                  "${SQL_DIR}/customizations.sql"
-                  "${SQL_DIR}/commit.sql")
+set(SQL_FILES
+  "${SQL_DIR}/begin.sql"
+  "${SQL_DIR}/proj_db_table_defs.sql"
+  "${SQL_DIR}/conversion_triggers.sql"
+  "${SQL_DIR}/metadata.sql"
+  "${SQL_DIR}/unit_of_measure.sql"
+  "${SQL_DIR}/area.sql"
+  "${SQL_DIR}/coordinate_system.sql"
+  "${SQL_DIR}/axis.sql"
+  "${SQL_DIR}/ellipsoid.sql"
+  "${SQL_DIR}/prime_meridian.sql"
+  "${SQL_DIR}/geodetic_datum.sql"
+  "${SQL_DIR}/vertical_datum.sql"
+  "${SQL_DIR}/conversion.sql"
+  "${SQL_DIR}/geodetic_crs.sql"
+  "${SQL_DIR}/projected_crs.sql"
+  "${SQL_DIR}/vertical_crs.sql"
+  "${SQL_DIR}/compound_crs.sql"
+  "${SQL_DIR}/helmert_transformation.sql"
+  "${SQL_DIR}/grid_transformation.sql"
+  "${SQL_DIR}/grid_transformation_custom.sql"
+  "${SQL_DIR}/other_transformation.sql"
+  "${SQL_DIR}/concatenated_operation.sql"
+  "${SQL_DIR}/alias_name.sql"
+  "${SQL_DIR}/supersession.sql"
+  "${SQL_DIR}/deprecation.sql"
+  "${SQL_DIR}/esri.sql"
+  "${SQL_DIR}/ignf.sql"
+  "${SQL_DIR}/grid_alternatives.sql"
+  "${SQL_DIR}/grid_alternatives_generated.sql"
+  "${SQL_DIR}/customizations.sql"
+  "${SQL_DIR}/commit.sql"
+)