From b08ab6324e982a801a3b444351d035ffe5bdd55f Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Wed, 16 May 2018 14:04:32 -0600
Subject: [PATCH] CMake: Move panda version logic to dtoolbase

---
 dtool/src/dtoolbase/CMakeLists.txt                       | 9 +++++++++
 .../{dtoolutil => dtoolbase}/checkPandaVersion.cxx.in    | 2 +-
 .../src/{dtoolutil => dtoolbase}/checkPandaVersion.h.in  | 2 +-
 dtool/src/{dtoolutil => dtoolbase}/pandaVersion.h.in     | 0
 dtool/src/dtoolutil/CMakeLists.txt                       | 8 --------
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename dtool/src/{dtoolutil => dtoolbase}/checkPandaVersion.cxx.in (92%)
 rename dtool/src/{dtoolutil => dtoolbase}/checkPandaVersion.h.in (96%)
 rename dtool/src/{dtoolutil => dtoolbase}/pandaVersion.h.in (100%)

diff --git a/dtool/src/dtoolbase/CMakeLists.txt b/dtool/src/dtoolbase/CMakeLists.txt
index 3de0b9cae4..21daf08d1f 100644
--- a/dtool/src/dtoolbase/CMakeLists.txt
+++ b/dtool/src/dtoolbase/CMakeLists.txt
@@ -1,4 +1,10 @@
+configure_file(pandaVersion.h.in pandaVersion.h)
+configure_file(checkPandaVersion.h.in checkPandaVersion.h)
+configure_file(checkPandaVersion.cxx.in checkPandaVersion.cxx)
+
 set(P3DTOOLBASE_HEADERS
+    ${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.h
+    ${CMAKE_CURRENT_BINARY_DIR}/pandaVersion.h
     addHash.I addHash.h
     atomicAdjust.h
     atomicAdjustDummyImpl.h atomicAdjustDummyImpl.I
@@ -38,6 +44,7 @@ set(P3DTOOLBASE_HEADERS
 )
 
 set(P3DTOOLBASE_SOURCES
+    ${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.cxx
     addHash.cxx
     atomicAdjustDummyImpl.cxx
     atomicAdjustI386Impl.cxx
@@ -74,6 +81,8 @@ add_component_library(p3dtoolbase SYMBOL BUILDING_DTOOL_DTOOLBASE
 # The extensions need py_panda.h and extension.h from interrogatedb
 target_include_directories(p3dtoolbase PUBLIC
   $<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>)
+# Help other libraries find the autogenerated version headers
+target_include_directories(p3dtoolbase PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 target_use_packages(p3dtoolbase THREADS EIGEN)
 target_interrogate(p3dtoolbase ${P3DTOOLBASE_SOURCES} EXTENSIONS ${P3DTOOLBASE_IGATEEXT})
 
diff --git a/dtool/src/dtoolutil/checkPandaVersion.cxx.in b/dtool/src/dtoolbase/checkPandaVersion.cxx.in
similarity index 92%
rename from dtool/src/dtoolutil/checkPandaVersion.cxx.in
rename to dtool/src/dtoolbase/checkPandaVersion.cxx.in
index e986a719ea..e62f0184c8 100644
--- a/dtool/src/dtoolutil/checkPandaVersion.cxx.in
+++ b/dtool/src/dtoolbase/checkPandaVersion.cxx.in
@@ -18,4 +18,4 @@
 
 #include "dtoolbase.h"
 
-EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@ = 0;
+EXPCL_DTOOL_DTOOLBASE int @PANDA_VERSION_SYMBOL@ = 0;
diff --git a/dtool/src/dtoolutil/checkPandaVersion.h.in b/dtool/src/dtoolbase/checkPandaVersion.h.in
similarity index 96%
rename from dtool/src/dtoolutil/checkPandaVersion.h.in
rename to dtool/src/dtoolbase/checkPandaVersion.h.in
index 162e16704a..0986e84b28 100644
--- a/dtool/src/dtoolutil/checkPandaVersion.h.in
+++ b/dtool/src/dtoolbase/checkPandaVersion.h.in
@@ -28,7 +28,7 @@
 
 #include "dtoolbase.h"
 
-extern EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@;
+extern EXPCL_DTOOL_DTOOLBASE int @PANDA_VERSION_SYMBOL@;
 
 #ifndef WIN32
 /* For Windows, exporting the symbol from the DLL is sufficient; the
diff --git a/dtool/src/dtoolutil/pandaVersion.h.in b/dtool/src/dtoolbase/pandaVersion.h.in
similarity index 100%
rename from dtool/src/dtoolutil/pandaVersion.h.in
rename to dtool/src/dtoolbase/pandaVersion.h.in
diff --git a/dtool/src/dtoolutil/CMakeLists.txt b/dtool/src/dtoolutil/CMakeLists.txt
index e2e8cd5cd6..182b69f91d 100644
--- a/dtool/src/dtoolutil/CMakeLists.txt
+++ b/dtool/src/dtoolutil/CMakeLists.txt
@@ -1,10 +1,4 @@
-configure_file(pandaVersion.h.in pandaVersion.h)
-configure_file(checkPandaVersion.h.in checkPandaVersion.h)
-configure_file(checkPandaVersion.cxx.in checkPandaVersion.cxx)
-
 set(P3DTOOLUTIL_HEADERS
-  ${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.h
-  ${CMAKE_CURRENT_BINARY_DIR}/pandaVersion.h
   config_dtoolutil.h
   dSearchPath.I dSearchPath.h
   executionEnvironment.I executionEnvironment.h filename.I
@@ -38,7 +32,6 @@ if(APPLE)
 endif()
 
 set(P3DTOOLUTIL_SOURCES
-  ${CMAKE_CURRENT_BINARY_DIR}/checkPandaVersion.cxx
   config_dtoolutil.cxx
   dSearchPath.cxx
   executionEnvironment.cxx filename.cxx
@@ -73,7 +66,6 @@ composite_sources(p3dtoolutil P3DTOOLUTIL_SOURCES)
 
 add_component_library(p3dtoolutil SYMBOL BUILDING_DTOOL_DTOOLUTIL
   ${P3DTOOLUTIL_HEADERS} ${P3DTOOLUTIL_SOURCES})
-target_include_directories(p3dtoolutil PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 # The extensions need py_panda.h and extension.h from interrogatedb
 target_include_directories(p3dtoolutil PUBLIC
   $<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>)