TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-05 11:28:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Make INTERROGATE_PYTHON_INTERFACE option dependent

Browse Source 
This also makes it sufficient for turning on Interrogate.
This commit is contained in:
Sam Edwards 2018-06-13 18:49:28 -06:00
parent d6d6df83ef
commit 21a30a8429
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/macros/Interrogate.cmake
View File

@ -237,7 +237,7 @@ endfunction(interrogate_sources)
# Python module when it's initialized. # Python module when it's initialized.
# #
function(add_python_module module) function(add_python_module module)
if(NOT HAVE_PYTHON OR NOT INTERROGATE_PYTHON_INTERFACE) if(NOT INTERROGATE_PYTHON_INTERFACE)
return() return()
endif() endif()

6
dtool/Config.cmake
View File

@ -6,6 +6,8 @@
# generate build scripts appropriate to each environment. # generate build scripts appropriate to each environment.
# #
include(CMakeDependentOption)
# Define the plaform we are building on. # Define the plaform we are building on.
# The values "UNIX", "WIN32", "MINGW", "MSYS", and "CYGWIN" # The values "UNIX", "WIN32", "MINGW", "MSYS", and "CYGWIN"
# are automatically provided by CMAKE. "APPLE" is also provided by # are automatically provided by CMAKE. "APPLE" is also provided by
@ -255,11 +257,11 @@ mark_as_advanced(HAVE_P3D_RTDIST PANDA_PACKAGE_VERSION PANDA_PACKAGE_HOST)
# The following options relate to interrogate, the tool that is # The following options relate to interrogate, the tool that is
# used to generate bindings for non-C++ languages. # used to generate bindings for non-C++ languages.
option(INTERROGATE_PYTHON_INTERFACE cmake_dependent_option(INTERROGATE_PYTHON_INTERFACE
"Do you want to generate a Python-callable interrogate interface? "Do you want to generate a Python-callable interrogate interface?
This is only necessary if you plan to make calls into Panda from a This is only necessary if you plan to make calls into Panda from a
program written in Python. This is done only if HAVE_PYTHON is also program written in Python. This is done only if HAVE_PYTHON is also
true." ON) true." ON "HAVE_PYTHON" OFF)
set(INTERROGATE_C_INTERFACE set(INTERROGATE_C_INTERFACE
"Do you want to generate a C-callable interrogate interface? This "Do you want to generate a C-callable interrogate interface? This

2
dtool/LocalSetup.cmake
View File

@ -256,7 +256,7 @@ else()
endif() endif()
message("") message("")
if(HAVE_INTERROGATE AND HAVE_PYTHON) if(INTERROGATE_PYTHON_INTERFACE)
message("Compilation will generate Python interfaces for Python ${PYTHON_VERSION_STRING}.") message("Compilation will generate Python interfaces for Python ${PYTHON_VERSION_STRING}.")
else() else()
message("Configuring Panda WITHOUT Python interfaces.") message("Configuring Panda WITHOUT Python interfaces.")

2
dtool/src/interrogatedb/CMakeLists.txt
View File

@ -46,7 +46,7 @@ install(FILES ${P3INTERROGATEDB_HEADERS} DESTINATION include/panda3d)
# Note we don't use the regular Interrogate macros; this has some custom flags # Note we don't use the regular Interrogate macros; this has some custom flags
# that would make it not worthwhile. # that would make it not worthwhile.
if(NOT HAVE_PYTHON OR NOT INTERROGATE_PYTHON_INTERFACE) if(NOT INTERROGATE_PYTHON_INTERFACE)
return() return()
endif() endif()