Don't special case PATCH in the dependencies

Got bitten with winflexbison, so that's a good hint to do what's cleaner
in the first place - treat patch the way we do any other subproject.

Author: starseeker

CMakeLists.txt

@@ -288,8 +288,7 @@ endif (USE_OSPRAY)
 # this.  We need to address the patch build tool first thing, since any of the
 # other ExternalProject_Add builds that follow may depend on it.
 ###############################################################################
-add_subdirectory(patch)
-
+add_project(patch)
 
 ###############################################################################
 # Although we have bundled flex and bison programs, they can be problematic to
@@ -335,15 +334,20 @@ add_project(astyle GROUPS "BRLCAD")
 add_project(lemon GROUPS "BRLCAD")
 add_project(re2c GROUPS "BRLCAD")
 add_project(perplex GROUPS "BRLCAD")
-#add_project(patchelf GROUPS "BRLCAD")
 add_project(strclear GROUPS "BRLCAD")
 add_project(xmltools GROUPS "BRLCAD")  # Used for Docbook building
 
-# This is intended to replace patchelf, but we are currently still
-# testing it out
+# RPATH editing - LIEF has the core capabilities, and plief exposes them via
+# a command line utility with patchelf compatible options, so we can drop
+# either patchelf or plief into our upstream workflows.
 add_project(lief GROUPS "BRLCAD")
 add_project(plief GROUPS "BRLCAD")
 
+# Keeping this set up for easy turn-on until we're confident plief+LIEF has
+# all of our use cases covered - plief is preferred, but we've already hit
+# one case where a bug in LIEF had to be fixed.
+#add_project(patchelf GROUPS "BRLCAD")
+
 ###############################################################################
 # Build logic is broken out per-library, but the ordering is important.  Some
 # libraries will depend on others listed here (for example, we want openNURBS

appleseed/CMakeLists.txt

@@ -20,7 +20,7 @@ if (ENABLE_APPLESEED)
 
   # git_submodule_init(appleseed CMakeLists.txt)
 
-  set(APPLESEED_DEPENDS BOOST EMBREE ONETBB JPEG PNG TIFF LLVM LZ4 OPENCOLORIO OPENEXR OPENIMAGEIO OSL XERCES_C ZLIB)
+  set(APPLESEED_DEPENDS BOOST EMBREE ONETBB JPEG PATCH PNG TIFF LLVM LZ4 OPENCOLORIO OPENEXR OPENIMAGEIO OSL XERCES_C ZLIB)
   TargetVars(APPLESEED_DEPENDS)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
@@ -72,10 +72,6 @@ if (ENABLE_APPLESEED)
 
   TargetInstallDeps(APPLESEED APPLESEED_DEPENDS)
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(APPLESEED_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
-
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)
   configure_file(

assetimport/CMakeLists.txt

@@ -19,7 +19,7 @@ if (ENABLE_ASSETIMPORT)
 
   git_submodule_init(assimp CMakeLists.txt)
 
-  set(ASSETIMPORT_DEPENDS ZLIB)
+  set(ASSETIMPORT_DEPENDS PATCH PUGIXML ZLIB)
   TargetVars(ASSETIMPORT_DEPENDS)
 
   if (TARGET ZLIB_BLD)
@@ -35,6 +35,7 @@ if (ENABLE_ASSETIMPORT)
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
     $<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
     -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
+    -DPUGIXML_ROOT=$<$<BOOL:${PUGIXML_TARGET}>:${CMAKE_BUNDLE_INSTALL_PREFIX}>
     -DBIN_DIR=${BIN_DIR}
     -DLIB_DIR=${LIB_DIR}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
@@ -58,10 +59,6 @@ if (ENABLE_ASSETIMPORT)
 
   TargetInstallDeps(ASSETIMPORT ASSETIMPORT_DEPENDS)
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(ASSETIMPORT_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
-
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)
   configure_file(

astyle/CMakeLists.txt

@@ -20,6 +20,9 @@ if (ENABLE_ASTYLE)
 
   git_submodule_init(astyle CMakeLists.txt)
 
+  set(ASTYLE_DEPENDS PATCH)
+  TargetVars(ASTYLE_DEPENDS)
+
   ExternalProject_Add(ASTYLE_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/astyle"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
@@ -41,9 +44,7 @@ if (ENABLE_ASTYLE)
     STEP_TARGETS install
     )
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(ASTYLE_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
+  TargetInstallDeps(ASTYLE ASTYLE_DEPENDS)
 
 endif (ENABLE_ASTYLE)
 

boost/CMakeLists.txt

@@ -19,7 +19,7 @@ if (ENABLE_BOOST)
 
   git_submodule_init(boost CMakeLists.txt)
 
-  set(BOOST_DEPENDS ICU ZLIB ZSTD)
+  set(BOOST_DEPENDS ICU PATCH ZLIB ZSTD)
   TargetVars(BOOST_DEPENDS)
 
   if (TARGET ZLIB_BLD)
@@ -55,9 +55,7 @@ if (ENABLE_BOOST)
     STEP_TARGETS install
     )
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(BOOST_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
+  TargetInstallDeps(BOOST BOOST_DEPENDS)
 
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)

deflate/CMakeLists.txt

@@ -19,6 +19,9 @@ if (ENABLE_DEFLATE)
 
   git_submodule_init(libdeflate CMakeLists.txt)
 
+  set(DEFLATE_DEPENDS PATCH)
+  TargetVars(DEFLATE_DEPENDS)
+
   ExternalProject_Add(DEFLATE_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/libdeflate"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
@@ -40,9 +43,7 @@ if (ENABLE_DEFLATE)
     STEP_TARGETS install
     )
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(DEFLATE_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
+  TargetInstallDeps(DEFLATE DEFLATE_DEPENDS)
 
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)

eigen/CMakeLists.txt

@@ -20,6 +20,9 @@ if (ENABLE_EIGEN)
 
   git_submodule_init(eigen CMakeLists.txt)
 
+  set(EIGEN_DEPENDS PATCH)
+  TargetVars(EIGEN_DEPENDS)
+
   ExternalProject_Add(EIGEN_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/eigen"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
@@ -44,9 +47,7 @@ if (ENABLE_EIGEN)
     STEP_TARGETS install
     )
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(EIGEN_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
+  TargetInstallDeps(EIGEN EIGEN_DEPENDS)
 
 endif (ENABLE_EIGEN)
 

embree/CMakeLists.txt

@@ -19,7 +19,7 @@ if (ENABLE_EMBREE)
 
   git_submodule_init(embree CMakeLists.txt)
 
-  set(EMBREE_DEPENDS BOOST ISPC ONETBB ZLIB)
+  set(EMBREE_DEPENDS BOOST ISPC ONETBB PATCH ZLIB)
   TargetVars(EMBREE_DEPENDS)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
@@ -55,10 +55,6 @@ if (ENABLE_EMBREE)
 
   TargetInstallDeps(EMBREE EMBREE_DEPENDS)
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(EMBREE_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
-
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)
   configure_file(

expat/CMakeLists.txt

@@ -19,6 +19,9 @@ if (ENABLE_EXPAT)
 
   git_submodule_init(libexpat CMakeLists.txt)
 
+  set(EXPAT_DEPENDS PATCH)
+  TargetVars(EXPAT_DEPENDS)
+
   ExternalProject_Add(EXPAT_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/libexpat"
     SOURCE_SUBDIR expat
@@ -40,9 +43,7 @@ if (ENABLE_EXPAT)
     STEP_TARGETS install
     )
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(EXPAT_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
+  TargetInstallDeps(EXPAT EXPAT_DEPENDS)
 
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)

flexbison/CMakeLists.txt

@@ -13,6 +13,9 @@ if (WIN32 AND ENABLE_FLEX)
 
   git_submodule_init(winflexbison CMakeLists.txt)
 
+  set(FLEX_DEPENDS PATCH)
+  TargetVars(FLEX_DEPENDS)
+
   ExternalProject_Add(FLEX_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/winflexbison"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
@@ -31,13 +34,19 @@ if (WIN32 AND ENABLE_FLEX)
     LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
     STEP_TARGETS install
     )
+
+  TargetInstallDeps(FLEX FLEX_DEPENDS)
+
 endif (WIN32 AND ENABLE_FLEX)
 
 if (NOT WIN32)
   if (ENABLE_FLEX)
 
     git_submodule_init(flex configure)
 
+    set(FLEX_DEPENDS PATCH)
+    TargetVars(FLEX_DEPENDS)
+
     set(FLEX_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/FLEX_BLD-prefix/src/FLEX_BLD")
 
     ExternalProject_Add(FLEX_BLD
@@ -56,11 +65,17 @@ if (NOT WIN32)
       LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
       STEP_TARGETS install
       )
+
+    TargetInstallDeps(FLEX FLEX_DEPENDS)
+
   endif (ENABLE_FLEX)
   if (ENABLE_BISON)
 
     git_submodule_init(bison configure)
 
+    set(BISON_DEPENDS PATCH)
+    TargetVars(BISON_DEPENDS)
+
     set(BISON_SRC_DIR "${CMAKE_CURRENT_BINARY_DIR}/BISON_BLD-prefix/src/BISON_BLD")
 
     ExternalProject_Add(BISON_BLD
@@ -80,17 +95,13 @@ if (NOT WIN32)
       LOG_OUTPUT_ON_FAILURE ${EXT_BUILD_QUIET}
       STEP_TARGETS install
       )
+
+    TargetInstallDeps(BISON BISON_DEPENDS)
+
   endif (ENABLE_BISON)
 
 endif (NOT WIN32)
 
-if (TARGET PATCH_BLD AND TARGET FLEX_BLD)
-  ExternalProject_Add_StepDependencies(FLEX_BLD configure PATCH_BLD-install)
-endif (TARGET PATCH_BLD AND TARGET FLEX_BLD)
-if (TARGET PATCH_BLD AND TARGET BISON_BLD)
-  ExternalProject_Add_StepDependencies(BISON_BLD configure PATCH_BLD-install)
-endif (TARGET PATCH_BLD AND TARGET BISON_BLD)
-
 # Local Variables:
 # tab-width: 8
 # mode: cmake

fmt/CMakeLists.txt

@@ -19,6 +19,9 @@ if (ENABLE_FMT)
 
   git_submodule_init(fmt CMakeLists.txt)
 
+  set(FMT_DEPENDS PATCH)
+  TargetVars(FMT_DEPENDS)
+
   ExternalProject_Add(FMT_BLD
     URL "${CMAKE_CURRENT_SOURCE_DIR}/fmt"
     BUILD_ALWAYS ${EXT_BUILD_ALWAYS} ${LOG_OPTS}
@@ -41,9 +44,7 @@ if (ENABLE_FMT)
     STEP_TARGETS install
     )
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(FMT_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
+  TargetInstallDeps(FMT FMT_DEPENDS)
 
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)

gdal/CMakeLists.txt

@@ -19,7 +19,7 @@ if (ENABLE_GDAL)
 
   git_submodule_init(gdal CMakeLists.txt)
 
-  set(GDAL_DEPENDS PNG PROJ SQLITE3 ZLIB)
+  set(GDAL_DEPENDS PATCH PNG PROJ SQLITE3 ZLIB)
   TargetVars(GDAL_DEPENDS)
 
   if (TARGET ZLIB_BLD)
@@ -177,10 +177,6 @@ if (ENABLE_GDAL)
 
   TargetInstallDeps(GDAL GDAL_DEPENDS)
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(GDAL_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
-
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)
   configure_file(

icu/CMakeLists.txt

@@ -22,6 +22,9 @@ if (NOT WIN32 AND NOT APPLE)
 
     git_submodule_init(icu icu4c/source/configure)
 
+    set(ICU_DEPENDS PATCH)
+    TargetVars(ICU_DEPENDS)
+
     ExternalProject_Add(ICU_BLD
       URL "${CMAKE_CURRENT_SOURCE_DIR}/icu"
       SOURCE_SUBDIR icu4c/source
@@ -37,9 +40,7 @@ if (NOT WIN32 AND NOT APPLE)
       STEP_TARGETS install
       )
 
-    if (TARGET PATCH_BLD)
-      ExternalProject_Add_StepDependencies(ICU_BLD configure PATCH_BLD-install)
-    endif (TARGET PATCH_BLD)
+    TargetInstallDeps(FMT FMT_DEPENDS)
 
     # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
     file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)

ispc/CMakeLists.txt

@@ -25,7 +25,7 @@ if (ENABLE_ISPC)
 
   git_submodule_init(ispc CMakeLists.txt)
 
-  set(ISPC_DEPENDS BISON FLEX LLVM NCURSES ZLIB)
+  set(ISPC_DEPENDS BISON FLEX PATCH LLVM NCURSES ZLIB)
   TargetVars(ISPC_DEPENDS)
   if (TARGET ZLIB_BLD)
     set(Z_PREFIX_STR "brl_")
@@ -70,10 +70,6 @@ if (ENABLE_ISPC)
 
   TargetInstallDeps(ISPC ISPC_DEPENDS)
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(ISPC_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
-
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)
   configure_file(

itcl/CMakeLists.txt

@@ -17,7 +17,7 @@ if (ENABLE_ITCL)
 
   git_submodule_init(itcl CMakeLists.txt)
 
-  set(ITCL_DEPENDS TCL)
+  set(ITCL_DEPENDS PATCH TCL)
   TargetVars(ITCL_DEPENDS)
 
   # If we're building ITCL, it's path setup must take into account the
@@ -50,10 +50,6 @@ if (ENABLE_ITCL)
 
   TargetInstallDeps(ITCL ITCL_DEPENDS)
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(ITCL_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
-
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)
   configure_file(

itk/CMakeLists.txt

@@ -38,7 +38,7 @@ if (ENABLE_ITK)
 
   git_submodule_init(itk CMakeLists.txt)
 
-  set(ITK_DEPENDS TCL TK ITCL)
+  set(ITK_DEPENDS PATCH TCL TK ITCL)
   TargetVars(ITK_DEPENDS)
 
   # If we're building ITK, it's path setup must take into account the
@@ -73,10 +73,6 @@ if (ENABLE_ITK)
 
   TargetInstallDeps(ITK ITK_DEPENDS)
 
-  if (TARGET PATCH_BLD)
-    ExternalProject_Add_StepDependencies(ITK_BLD configure PATCH_BLD-install)
-  endif (TARGET PATCH_BLD)
-
   # Copy the license into position in CMAKE_BUNDLE_INSTALL_PREFIX
   file(MAKE_DIRECTORY ${CMAKE_BUNDLE_INSTALL_PREFIX}/doc/legal/other)
   configure_file(