Revision: 77284
http://sourceforge.net/p/brlcad/code/77284
Author: starseeker
Date: 2020-09-30 14:49:37 +0000 (Wed, 30 Sep 2020)
Log Message:
-----------
Add a 'deps' target so we can build just the dependencies ahead of doing the
main build. Also, always check locally first for Tcl related libraries - the
possible target set coverted by FindTCL is larger than just TCL_BLD.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-30 14:45:00 UTC (rev 77283)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-09-30 14:49:37 UTC (rev 77284)
@@ -216,6 +216,10 @@
endif (TARGET ${T}_BLD)
endforeach(T ${TARGET_LIST})
+if(BRLCAD_DEPS)
+ add_custom_target(deps DEPENDS ${BRLCAD_DEPS})
+endif(BRLCAD_DEPS)
+
# We've built everything we needed to build - now we can build BRL-CAD itself
ExternalProject_Add(BRLCAD_BLD
SOURCE_DIR "${BRLCAD_SOURCE_DIR}"
@@ -241,7 +245,7 @@
-DBSON_ROOT=$<$<BOOL:${BSON_TARGET}>:${CMAKE_BINARY_DIR}>
-DPROJ4_ROOT=$<$<BOOL:${PROJ4_TARGET}>:${CMAKE_BINARY_DIR}>
-DGDAL_ROOT=$<$<BOOL:${GDAL_TARGET}>:${CMAKE_BINARY_DIR}>
- -DTCL_ROOT=$<$<BOOL:${TCL_TARGET}>:${CMAKE_BINARY_DIR}>
+ -DTCL_ROOT=${CMAKE_BINARY_DIR}
DEPENDS ${BRLCAD_DEPS}
)
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
