3 files changed, 35 insertions, 33 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b618091b..ae721d46 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,7 +17,8 @@ proj_add_gie_test("GIGS-5101.1-jhs" "gigs/5101.1-jhs.gie")
 proj_add_gie_test("GIGS-5101.2-jhs" "gigs/5101.2-jhs.gie")
 proj_add_gie_test("GIGS-5101.3-jhs" "gigs/5101.3-jhs.gie")
 proj_add_gie_test("GIGS-5101.4-jhs-etmerc" "gigs/5101.4-jhs-etmerc.gie")
-#proj_add_gie_test("GIGS-5101.4-jhs" "gigs/5101.4-jhs.gie") # Same as above, but using etmerc instead of tmerc
+# Same as above, but using etmerc instead of tmerc
+#proj_add_gie_test("GIGS-5101.4-jhs" "gigs/5101.4-jhs.gie")
 proj_add_gie_test("GIGS-5102.1" "gigs/5102.1.gie")
 #proj_add_gie_test("GIGS-5102.2" "gigs/5102.2.gie")
 proj_add_gie_test("GIGS-5103.1" "gigs/5103.1.gie")
diff --git a/test/cli/CMakeLists.txt b/test/cli/CMakeLists.txt
index 0c4ccf1b..4e1ab75a 100644
--- a/test/cli/CMakeLists.txt
+++ b/test/cli/CMakeLists.txt
@@ -5,11 +5,11 @@ set(CS2CS_BIN "cs2cs")
 set(PROJ_BIN "proj")
 set(PROJINFO_BIN "projinfo")
 set(CCT_BIN "cct")
-proj_add_test_script_sh("test27" PROJ_BIN )
-proj_add_test_script_sh("test83" PROJ_BIN )
-proj_add_test_script_sh("testvarious" CS2CS_BIN )
+proj_add_test_script_sh("test27" PROJ_BIN)
+proj_add_test_script_sh("test83" PROJ_BIN)
+proj_add_test_script_sh("testvarious" CS2CS_BIN)
 proj_add_test_script_sh("testdatumfile" CS2CS_BIN "connu")
 proj_add_test_script_sh("testIGNF" CS2CS_BIN "ntf_r93.gsb")
 proj_add_test_script_sh("testntv2" CS2CS_BIN "ntv2_0.gsb")
-proj_add_test_script_sh("testprojinfo" PROJINFO_BIN )
-proj_add_test_script_sh("testcct" CCT_BIN )
+proj_add_test_script_sh("testprojinfo" PROJINFO_BIN)
+proj_add_test_script_sh("testcct" CCT_BIN)
diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt
index 58638fa4..9b160be8 100644
--- a/test/unit/CMakeLists.txt
+++ b/test/unit/CMakeLists.txt
@@ -2,12 +2,12 @@
 
 option(USE_EXTERNAL_GTEST "Compile against external GTest" OFF)
 
-if (USE_EXTERNAL_GTEST)
+if(USE_EXTERNAL_GTEST)
 
 message(STATUS "Using external GTest")
 find_package(GTest 1.8.1 CONFIG REQUIRED)
 
-else (USE_EXTERNAL_GTEST)
+else()
 
 message(STATUS "Using internal GTest")
 
@@ -23,11 +23,11 @@ string(REGEX REPLACE "\\-W[a-z\\-]+" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 # Source https://github.com/google/googletest/blob/master/googletest/README.md
 # Download and unpack googletest at configure time
 configure_file(
-    ${CMAKE_SOURCE_DIR}/test/googletest/CMakeLists.txt.in
-    ${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt)
+  ${CMAKE_SOURCE_DIR}/test/googletest/CMakeLists.txt.in
+  ${CMAKE_BINARY_DIR}/googletest-download/CMakeLists.txt)
 execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
   RESULT_VARIABLE result
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download )
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/googletest-download)
 if(result)
   message(FATAL_ERROR "CMake step for googletest failed: ${result}")
 endif()
@@ -43,9 +43,10 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 # Add googletest directly to our build. This defines
 # the gtest and gtest_main targets.
 option(INSTALL_GTEST "Enable installation of googletest" OFF)
-add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src
-                 ${CMAKE_BINARY_DIR}/googletest-build
-                 EXCLUDE_FROM_ALL)
+add_subdirectory(
+  ${CMAKE_BINARY_DIR}/googletest-src
+  ${CMAKE_BINARY_DIR}/googletest-build
+  EXCLUDE_FROM_ALL)
 
 # FIXME: Deal with our old-school CMakeLists.txt behaving badly
 set(CMAKE_C_FLAGS "${_save_c_flags}")
@@ -56,14 +57,14 @@ unset(_save_cxx_flags)
 # Provide the same target name as find_package(GTest)
 add_library(GTest::gtest ALIAS gtest)
 
-endif(USE_EXTERNAL_GTEST)
+endif()  # USE_EXTERNAL_GTEST
 
 #
 # Build PROJ unit tests
 #
 
 if("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC" AND BUILD_LIBPROJ_SHARED)
-add_definitions(-DPROJ_MSVC_DLL_IMPORT=1)
+  add_definitions(-DPROJ_MSVC_DLL_IMPORT=1)
 endif()
 
 include_directories(${CMAKE_SOURCE_DIR}/include)
@@ -86,31 +87,31 @@ target_link_libraries(proj_errno_string_test
 add_test(NAME proj_errno_string_test COMMAND proj_errno_string_test)
 
 add_executable(proj_angular_io_test
-    main.cpp
-    proj_angular_io_test.cpp)
+  main.cpp
+  proj_angular_io_test.cpp)
 target_link_libraries(proj_angular_io_test
-    GTest::gtest
-    ${PROJ_LIBRARIES})
+  GTest::gtest
+  ${PROJ_LIBRARIES})
 add_test(NAME proj_angular_io_test COMMAND proj_angular_io_test)
 
 add_executable(proj_context_test
-    main.cpp
-    proj_context_test.cpp)
+  main.cpp
+  proj_context_test.cpp)
 target_link_libraries(proj_context_test
-    GTest::gtest
-    ${PROJ_LIBRARIES})
+  GTest::gtest
+  ${PROJ_LIBRARIES})
 add_test(NAME proj_context_test COMMAND proj_context_test)
 
-if (MSVC AND BUILD_LIBPROJ_SHARED)
-# ph_phi2_test not compatible of a .dll build
+if(MSVC AND BUILD_LIBPROJ_SHARED)
+  # ph_phi2_test not compatible of a .dll build
 else()
-add_executable(pj_phi2_test
-        main.cpp
-        pj_phi2_test.cpp)
-target_link_libraries(pj_phi2_test
-        GTest::gtest
-        ${PROJ_LIBRARIES})
-add_test(NAME pj_phi2_test COMMAND pj_phi2_test)
+  add_executable(pj_phi2_test
+    main.cpp
+    pj_phi2_test.cpp)
+  target_link_libraries(pj_phi2_test
+    GTest::gtest
+    ${PROJ_LIBRARIES})
+  add_test(NAME pj_phi2_test COMMAND pj_phi2_test)
 endif()
 
 add_executable(proj_test_cpp_api