Revision: 77598
http://sourceforge.net/p/brlcad/code/77598
Author: starseeker
Date: 2020-10-23 13:40:59 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Manage the utility in the CMakeLists.txt file, not the module.
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
Modified:
brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-10-23 13:32:04 UTC (rev 77597)
+++ brlcad/branches/extbuild/src/other/ext/CMake/ExternalProject_Target.cmake
2020-10-23 13:40:59 UTC (rev 77598)
@@ -44,12 +44,6 @@
set(${outvar} ${TOUT} PARENT_SCOPE)
endfunction(fcfgcpy file)
-# Custom patch utility to replace the build directory path with the install
-# directory path in text files - make sure CMAKE_BINARY_DIR and
-# CMAKE_INSTALL_PREFIX are finalized before generating this file!
-configure_file(${${CMAKE_PROJECT_NAME}_CMAKE_DIR}/buildpath_replace.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/buildpath_replace.cxx)
-add_executable(buildpath_replace
${CMAKE_CURRENT_BINARY_DIR}/buildpath_replace.cxx)
-
function(ExternalProject_ByProducts etarg extproj extroot dir)
cmake_parse_arguments(E "FIXPATH;NOINSTALL" "" "" ${ARGN})
Modified: brlcad/branches/extbuild/src/other/ext/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-10-23
13:32:04 UTC (rev 77597)
+++ brlcad/branches/extbuild/src/other/ext/CMakeLists.txt 2020-10-23
13:40:59 UTC (rev 77598)
@@ -144,6 +144,13 @@
# Independent projects with their own build systems (potentially not CMake
# based) need ExternalProject_Add
include(ExternalProject)
+
+# Custom patch utility to replace the build directory path with the install
+# directory path in text files - make sure CMAKE_BINARY_DIR and
+# CMAKE_INSTALL_PREFIX are finalized before generating this file!
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CMake/buildpath_replace.cxx.in
${CMAKE_CURRENT_BINARY_DIR}/buildpath_replace.cxx)
+add_executable(buildpath_replace
${CMAKE_CURRENT_BINARY_DIR}/buildpath_replace.cxx)
+
# BRL-CAD defines some additional custom targets used to manage the outputs of
# ExternalProject_Add targets.
# Note- make sure CMAKE_BINARY_DIR and CMAKE_INSTALL_PREFIX are finalized
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
