TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Move panda version logic to dtoolbase

Browse Source
This commit is contained in:
Sam Edwards 2018-05-16 14:04:32 -06:00
parent 9f46d3dc48
commit b08ab6324e
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dtool/src/dtoolbase/CMakeLists.txt
View File

@ -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})

2
dtool/src/dtoolutil/checkPandaVersion.cxx.in → dtool/src/dtoolbase/checkPandaVersion.cxx.in
View File

@ -18,4 +18,4 @@
#include "dtoolbase.h"
EXPCL_DTOOL_DTOOLUTIL int @PANDA_VERSION_SYMBOL@ = 0;
EXPCL_DTOOL_DTOOLBASE int @PANDA_VERSION_SYMBOL@ = 0;

2
dtool/src/dtoolutil/checkPandaVersion.h.in → dtool/src/dtoolbase/checkPandaVersion.h.in
View File

@ -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

0
dtool/src/dtoolutil/pandaVersion.h.in → dtool/src/dtoolbase/pandaVersion.h.in
View File

8
dtool/src/dtoolutil/CMakeLists.txt
View File

@ -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>)