Revision: 77418
http://sourceforge.net/p/brlcad/code/77418
Author: starseeker
Date: 2020-10-13 19:42:37 +0000 (Tue, 13 Oct 2020)
Log Message:
-----------
Can do something like this to keep the stand-alone capability and still
integrate with the parent build (this isn't working right now, but illustrates
the idea.)
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdPartyExecutable.cmake
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
2020-10-13 19:39:29 UTC (rev 77417)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
2020-10-13 19:42:37 UTC (rev 77418)
@@ -265,6 +265,17 @@
# After all that, we know now what to do about this particular dependency
set(BRLCAD_${vroot}_BUILD "${BRLCAD_${vroot}_BUILD}" PARENT_SCOPE)
+
+ # If this is a BRL-CAD build, update the options
+ if (COMMAND BRLCAD_OPTION)
+ if(NOT ${vroot}_UNDOCUMENTED)
+ BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${vroot}"
"${${CMAKE_PROJECT_NAME}_${vroot}}"
+ TYPE ABS
+ ALIASES ${TP_ALIASES}
+ DESCRIPTION "${description}")
+ endif(NOT ${vroot}_UNDOCUMENTED)
+ endif (COMMAND BRLCAD_OPTION)
+
# For drop-down menus in CMake gui - set STRINGS property
set_property(CACHE BRLCAD_${vroot} PROPERTY STRINGS AUTO BUNDLED SYSTEM)
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdPartyExecutable.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdPartyExecutable.cmake
2020-10-13 19:39:29 UTC (rev 77417)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdPartyExecutable.cmake
2020-10-13 19:42:37 UTC (rev 77418)
@@ -301,6 +301,18 @@
mark_as_advanced(${varname_root}_EXECUTABLE_TARGET)
mark_as_advanced(${varname_root}_FOUND)
+
+ # If this is a BRL-CAD build, update the options
+ if (COMMAND BRLCAD_OPTION)
+ if(TP_ALIASES AND TP_DESCRIPTION)
+ BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${vroot}"
"${${CMAKE_PROJECT_NAME}_${vroot}}"
+ TYPE ABS
+ ALIASES ${TP_ALIASES}
+ DESCRIPTION "${TP_DESCRIPTION}")
+ endif(TP_ALIASES AND TP_DESCRIPTION)
+ endif (COMMAND BRLCAD_OPTION)
+
+
# Tell the calling scope what the final result was
set(BRLCAD_${varname_root}_BUILD ${BRLCAD_${varname_root}_BUILD}
PARENT_SCOPE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
