Revision: 77360
http://sourceforge.net/p/brlcad/code/77360
Author: starseeker
Date: 2020-10-07 20:10:56 +0000 (Wed, 07 Oct 2020)
Log Message:
-----------
Use variable, not hardcoded path
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-07 19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-07 20:10:56 UTC (rev 77360)
@@ -137,7 +137,8 @@
# It's not enough to simply generate the outputs - we'll also need to install
# them, which means passing the relevant information back up to the parent
# build. We do so with a file the parent build knows to look for:
-file(WRITE "${BRLCAD_BINARY_DIR}/superbuild.cmake" "\#superbuild outputs\n")
+set(SUPERBUILD "${BRLCAD_BINARY_DIR}/superbuild.cmake")
+file(WRITE "${SUPERBUILD_OUT}" "\#superbuild outputs\n")
###############################################################################
# BRL-CAD and some of its dependencies require the lemon, re2c and perplex
@@ -190,46 +191,46 @@
# For anything we've built here, we need to let the parent build know
# where to go looking for key components
if (TARGET PERPLEX_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(LEMON_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(LEMON_TEMPLATE
${BRLCAD_BINARY_DIR}/${DATA_DIR}/lemon/lempar.c)\n")
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(RE2C_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(PERPLEX_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(PERPLEX_TEMPLATE
${BRLCAD_BINARY_DIR}/${DATA_DIR}/perplex/perplex_template.c)\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(LEMON_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(LEMON_TEMPLATE
${BRLCAD_BINARY_DIR}/${DATA_DIR}/lemon/lempar.c)\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(RE2C_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(PERPLEX_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(PERPLEX_TEMPLATE
${BRLCAD_BINARY_DIR}/${DATA_DIR}/perplex/perplex_template.c)\n")
else (TARGET PERPLEX_BLD)
message(FATAL_ERROR "Failed to build perplex\n")
endif (TARGET PERPLEX_BLD)
if (TARGET NETPBM_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(NETPBM_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(NETPBM_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
endif (TARGET NETPBM_BLD)
if (TARGET STEPCODE_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(STEPCODE_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(STEPCODE_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
endif (TARGET STEPCODE_BLD)
if (TARGET BSON_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(BSON_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(BSON_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
endif (TARGET BSON_BLD)
if (TARGET PROJ4_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(PROJ4_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(PROJ4_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
endif (TARGET PROJ4_BLD)
if (TARGET GDAL_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(GDAL_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(GDAL_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
endif (TARGET GDAL_BLD)
if (TARGET TCL_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(TCL_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(TCL_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
endif (TARGET TCL_BLD)
# (For REGEX, ZLIB and PNG we need to do a little extra work and supply our
# custom library names so find_package knows about them.)
if (TARGET REGEX_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(REGEX_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(REGEX_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(REGEX_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(REGEX_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
endif (TARGET REGEX_BLD)
if (TARGET ZLIB_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(ZLIB_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(ZLIB_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(ZLIB_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(ZLIB_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
endif (TARGET ZLIB_BLD)
if (TARGET PNG_BLD)
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(PNG_ROOT
\"${BRLCAD_BINARY_DIR}\")\n")
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "set(PNG_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(PNG_ROOT \"${BRLCAD_BINARY_DIR}\")\n")
+ file(APPEND "${SUPERBUILD_OUT}" "set(PNG_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
endif (TARGET PNG_BLD)
# Local Variables:
Modified: brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -30,7 +30,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(bson BSON_BLD
OUTPUT_FILE ${BSON_BASENAME}${BSON_SUFFIX}
STATIC_OUTPUT_FILE ${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -33,7 +33,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(gdal GDAL_BLD
OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -104,7 +104,7 @@
endif (NOT MSVC)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(itcl ITCL_BLD
SUBDIR itcl${ITCL_VERSION}
OUTPUT_FILE ${ITCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -97,7 +97,7 @@
endif (NOT MSVC)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(itk ITK_BLD
SUBDIR itk${ITK_VERSION}
OUTPUT_FILE ${ITK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-07 19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-07 20:10:56 UTC (rev 77360)
@@ -83,7 +83,7 @@
endif (NOT MSVC)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_ByProducts(IWIDGETS_BLD
${LIB_DIR}/iwidgets${IWIDGETS_VERSION}
demos/buttonbox
demos/calendar
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-07 19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-07 20:10:56 UTC (rev 77360)
@@ -22,7 +22,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(netpbm NETPBM_BLD
OUTPUT_FILE ${NETPBM_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${NETPBM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -47,7 +47,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(png PNG_BLD
OUTPUT_FILE ${PNG_BASENAME}${PNG_SUFFIX}
STATIC_OUTPUT_FILE ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-07 19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-07 20:10:56 UTC (rev 77360)
@@ -31,7 +31,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(proj PROJ4_BLD
OUTPUT_FILE ${PROJ_BASENAME}${PROJ_SUFFIX}
STATIC_OUTPUT_FILE ${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-07 19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-07 20:10:56 UTC (rev 77360)
@@ -30,7 +30,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(regex REGEX_BLD
OUTPUT_FILE ${REGEX_BASENAME}${REGEX_SUFFIX}
STATIC_OUTPUT_FILE ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-07 19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-07 20:10:56 UTC (rev 77360)
@@ -41,7 +41,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
set(STEPCODE_LIBS base express exppp stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
ExternalProject_Target(lib${SCLIB} STEPCODE_BLD
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -66,7 +66,7 @@
endif (NOT MSVC)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(tcl TCL_BLD
OUTPUT_FILE ${TCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${TCL_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -61,7 +61,7 @@
endif (NOT MSVC)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(tk TK_BLD
OUTPUT_FILE ${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${TK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
2020-10-07 19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
2020-10-07 20:10:56 UTC (rev 77360)
@@ -30,7 +30,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(utahrle UTAHRLE_BLD
OUTPUT_FILE ${UTAHRLE_BASENAME}${UTAHRLE_SUFFIX}
STATIC_OUTPUT_FILE ${UTAHRLE_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-07
19:24:07 UTC (rev 77359)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-07
20:10:56 UTC (rev 77360)
@@ -33,7 +33,7 @@
)
# Tell the parent build about files and libraries
- file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ file(APPEND "${SUPERBUILD_OUT}" "
ExternalProject_Target(zlib ZLIB_BLD
OUTPUT_FILE ${ZLIB_BASENAME}${ZLIB_SUFFIX}
STATIC_OUTPUT_FILE ${ZLIB_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
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
