From fd73e5344c8018ddf92a61c87031bcb829aa95df Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 15 Feb 2019 13:37:24 +0100
Subject: DROP pointless GRIDSHIFT_FILES assignment

---
 data/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8d3a06b2..b17b53cb 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -20,8 +20,6 @@ set(PROJ_DICTIONARY  world
 file(GLOB GSB_FILES  *.gsb)
 file(GLOB GTX_FILES  *.gtx)
 set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES})
-set(GRIDSHIFT_FILES ${GRIDSHIFT_FILES}
-                     )
 
 set(ALL_SQL_IN "${CMAKE_CURRENT_SOURCE_DIR}/all.sql.in")
 set(PROJ_DB "${CMAKE_CURRENT_SOURCE_DIR}/proj.db")
-- 
cgit v1.2.3


From 09a799e6ceb1b1fc9bdc38c3892a8d4cea4ec0fb Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 15 Feb 2019 13:37:27 +0100
Subject: Create SQL files in build tree

---
 data/CMakeLists.txt            | 10 ++++++----
 data/generate_all_sql_in.cmake |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index b17b53cb..7d09a4c9 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -21,12 +21,13 @@ file(GLOB GSB_FILES  *.gsb)
 file(GLOB GTX_FILES  *.gtx)
 set(GRIDSHIFT_FILES ${GSB_FILES} ${GTX_FILES})
 
-set(ALL_SQL_IN "${CMAKE_CURRENT_SOURCE_DIR}/all.sql.in")
-set(PROJ_DB "${CMAKE_CURRENT_SOURCE_DIR}/proj.db")
+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} -P "${CMAKE_CURRENT_SOURCE_DIR}/generate_all_sql_in.cmake"
+    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"
@@ -51,6 +52,7 @@ add_custom_target(generate_proj_db ALL DEPENDS ${PROJ_DB})
 #
 set(ALL_DATA_FILE ${PROJ_DICTIONARY}
                   ${GRIDSHIFT_FILES}
-                  ${GEOID_FILES} "proj.db")
+                  ${GEOID_FILES}
+                  ${PROJ_DB})
 install(FILES ${ALL_DATA_FILE}
         DESTINATION ${DATADIR})
diff --git a/data/generate_all_sql_in.cmake b/data/generate_all_sql_in.cmake
index 51cfa717..ef99b349 100644
--- a/data/generate_all_sql_in.cmake
+++ b/data/generate_all_sql_in.cmake
@@ -3,8 +3,8 @@ function(cat IN_FILE OUT_FILE)
   file(APPEND ${OUT_FILE} "${CONTENTS}")
 endfunction()
 
-file(WRITE all.sql.in "")
+file(WRITE "${ALL_SQL_IN}" "")
 include(sql_filelist.cmake)
 foreach(SQL_FILE ${SQL_FILES})
-  cat(${SQL_FILE} all.sql.in)
+  cat(${SQL_FILE} "${ALL_SQL_IN}")
 endforeach()
-- 
cgit v1.2.3


From 1e6998a01edfb243d201bba5dd05bbcc239069dd Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 15 Feb 2019 13:37:30 +0100
Subject: Copy test data files to build tree

---
 data/CMakeLists.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 7d09a4c9..894deeff 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -47,6 +47,15 @@ add_custom_command(OUTPUT ${PROJ_DB}
 
 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}
+                 null
+                 ${GRIDSHIFT_FILES}
+                 ${GEOID_FILES})
+        configure_file(${FILE} ${FILE} COPYONLY)
+    endforeach()
+endif()
+
 #
 #install
 #
-- 
cgit v1.2.3


From 24c78734e88cab497d267159792963bed93383d6 Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 15 Feb 2019 17:11:31 +0100
Subject: Add `null` to `PROJ_DICTIONARY` files

---
 data/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 894deeff..e64015b9 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,7 +2,8 @@
 # files containing dictionary of useful projection
 #
 
-set(PROJ_DICTIONARY  world
+set(PROJ_DICTIONARY  null
+                     world
                      other.extra
                      nad27
                      GL27
@@ -49,7 +50,6 @@ 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}
-                 null
                  ${GRIDSHIFT_FILES}
                  ${GEOID_FILES})
         configure_file(${FILE} ${FILE} COPYONLY)
-- 
cgit v1.2.3


From 482b94bdfbc6fff0f24ecb82249136aeabb6892b Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Fri, 15 Feb 2019 17:16:03 +0100
Subject: Remove unused `GEOID_FILES` variable

---
 data/CMakeLists.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'data')

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e64015b9..3032f4bd 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -50,8 +50,7 @@ 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}
-                 ${GEOID_FILES})
+                 ${GRIDSHIFT_FILES})
         configure_file(${FILE} ${FILE} COPYONLY)
     endforeach()
 endif()
@@ -61,7 +60,6 @@ endif()
 #
 set(ALL_DATA_FILE ${PROJ_DICTIONARY}
                   ${GRIDSHIFT_FILES}
-                  ${GEOID_FILES}
                   ${PROJ_DB})
 install(FILES ${ALL_DATA_FILE}
         DESTINATION ${DATADIR})
-- 
cgit v1.2.3