Revision: 77343
http://sourceforge.net/p/brlcad/code/77343
Author: starseeker
Date: 2020-10-06 16:18:33 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
It will be the parent build that needs to do these extensions
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
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-06 13:53:51 UTC (rev 77342)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-06 16:18:33 UTC (rev 77343)
@@ -134,6 +134,10 @@
# hardcoded.
set(BRLCAD_DEPS)
+# 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")
###############################################################################
# BRL-CAD and some of its dependencies require the lemon, re2c and perplex
@@ -185,7 +189,6 @@
# For anything we've built here, we need to let the parent build know
# where to go looking for key components
-file(WRITE "${BRLCAD_BINARY_DIR}/superbuild.cmake" "\#superbuild outputs\n")
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")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-06
13:53:51 UTC (rev 77342)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-06
16:18:33 UTC (rev 77343)
@@ -31,11 +31,14 @@
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DZ_PREFIX_STR=${Z_PREFIX_STR}
)
+
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(zlib ZLIB_BLD
OUTPUT_FILE ${ZLIB_BASENAME}${ZLIB_SUFFIX}
STATIC_OUTPUT_FILE ${ZLIB_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1"
- LINK_TARGET "${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ SYMLINKS
\"${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1\"
+ LINK_TARGET \"${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
RPATH
)
ExternalProject_ByProducts(ZLIB_BLD ${INCLUDE_DIR}
@@ -42,6 +45,7 @@
zconf.h
zlib.h
)
+ ")
list(APPEND BRLCAD_DEPS ZLIB_BLD)
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
