Revision: 77344
http://sourceforge.net/p/brlcad/code/77344
Author: starseeker
Date: 2020-10-06 16:45:52 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
Getting close to a successful make install
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/CMakeLists.txt
brlcad/branches/thirdparty_rework/misc/CMake/ExternalProject_Target.cmake
brlcad/branches/thirdparty_rework/src/other/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/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-06 16:18:33 UTC
(rev 77343)
+++ brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-06 16:45:52 UTC
(rev 77344)
@@ -220,6 +220,12 @@
# that process is independent of the main BRL-CAD build, which just needs to
# call find_package with the appropriate arguments.
+# We need some custom logic to augment ExternalProject_Add:
+# Note- make sure CMAKE_BINARY_DIR and CMAKE_INSTALL_PREFIX are finalized
+# BEFORE including this file!
+include(ExternalProject)
+include(ExternalProject_Target)
+
# Step 1 is to write out all BRL-CAD related variables to a file for
# loading by the 3rd party superbuild: (https://stackoverflow.com/a/9328525)
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/superbuild")
Modified:
brlcad/branches/thirdparty_rework/misc/CMake/ExternalProject_Target.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/ExternalProject_Target.cmake
2020-10-06 16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/misc/CMake/ExternalProject_Target.cmake
2020-10-06 16:45:52 UTC (rev 77344)
@@ -22,6 +22,9 @@
# to be ready. The key variable CMAKE_BUILD_RPATH comes from running the
# function cmake_set_rpath, which must be available.
+# Be quite about tool outputs by default
+set(EXTPROJ_VERBOSE 0)
+
# 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!
@@ -214,10 +217,6 @@
cmake_parse_arguments(E "RPATH;EXEC"
"SUBDIR;OUTPUT_FILE;LINK_TARGET;LINK_TARGET_DEBUG;STATIC_OUTPUT_FILE;STATIC_LINK_TARGET;STATIC_LINK_TARGET_DEBUG"
"SYMLINKS;DEPS" ${ARGN})
- if(NOT TARGET ${extproj})
- message(FATAL_ERROR "${extprog} is not a target")
- endif(NOT TARGET ${extproj})
-
# Protect against redefinition of already defined targets.
if(TARGET ${etarg})
message(FATAL_ERROR "Target ${etarg} is already defined\n")
@@ -271,17 +270,20 @@
# If we do have a static lib as well, handle that
if (E_STATIC AND BUILD_STATIC_LIBS)
- add_library(${etarg}-static STATIC IMPORTED GLOBAL)
- if (E_STATIC_LINK_TARGET AND NOT MSVC)
- ET_target_props(${etarg}-static "${E_IMPORT_PREFIX}"
${E_STATIC_LINK_TARGET} STATIC_LINK_TARGET_DEBUG "${STATIC_LINK_TARGET_DEBUG}"
STATIC)
- else (E_STATIC_LINK_TARGET AND NOT MSVC)
- ET_target_props(${etarg}-static "${E_IMPORT_PREFIX}"
${E_STATIC_OUTPUT_FILE} STATIC_LINK_TARGET_DEBUG "${STATIC_LINK_TARGET_DEBUG}"
STATIC)
- endif (E_STATIC_LINK_TARGET AND NOT MSVC)
- if (MSVC)
- install(FILES
"${CMAKE_BINARY_DIR}/${BIN_DIR}/${E_SUBDIR}/${E_OUTPUT_FILE}" DESTINATION
${BIN_DIR}/${E_SUBDIR})
- else (MSVC)
- install(FILES
"${CMAKE_BINARY_DIR}/${LIB_DIR}/${E_SUBDIR}/${E_OUTPUT_FILE}" DESTINATION
${LIB_DIR}/${E_SUBDIR})
- endif (MSVC)
+ if (EXISTS "${E_STATIC_OUTPUT_FILE}")
+ message("Found: ${E_STATIC_OUTPUT_FILE}")
+ add_library(${etarg}-static STATIC IMPORTED GLOBAL)
+ if (E_STATIC_LINK_TARGET AND NOT MSVC)
+ ET_target_props(${etarg}-static "${E_IMPORT_PREFIX}"
${E_STATIC_LINK_TARGET} STATIC_LINK_TARGET_DEBUG "${STATIC_LINK_TARGET_DEBUG}"
STATIC)
+ else (E_STATIC_LINK_TARGET AND NOT MSVC)
+ ET_target_props(${etarg}-static "${E_IMPORT_PREFIX}"
${E_STATIC_OUTPUT_FILE} STATIC_LINK_TARGET_DEBUG "${STATIC_LINK_TARGET_DEBUG}"
STATIC)
+ endif (E_STATIC_LINK_TARGET AND NOT MSVC)
+ if (MSVC)
+ install(FILES
"${CMAKE_BINARY_DIR}/${BIN_DIR}/${E_SUBDIR}/${E_OUTPUT_FILE}" DESTINATION
${BIN_DIR}/${E_SUBDIR})
+ else (MSVC)
+ install(FILES
"${CMAKE_BINARY_DIR}/${LIB_DIR}/${E_SUBDIR}/${E_OUTPUT_FILE}" DESTINATION
${LIB_DIR}/${E_SUBDIR})
+ endif (MSVC)
+ endif (EXISTS "${E_STATIC_OUTPUT_FILE}")
endif (E_STATIC AND BUILD_STATIC_LIBS)
else (NOT E_EXEC)
@@ -295,13 +297,12 @@
endif (NOT E_EXEC)
- # Let CMake know there is a target dependency here, despite this being an
import target
- add_dependencies(${etarg} ${extproj})
-
# Add install rules for any symlinks the caller has listed
if(E_SYMLINKS AND NOT MSVC)
foreach(slink ${E_SYMLINKS})
- install(FILES "${CMAKE_BINARY_DIR}/${LIB_DIR}/${E_SUBDIR}/${slink}"
DESTINATION ${LIB_DIR}/${E_SUBDIR})
+ if (EXISTS "${CMAKE_BINARY_DIR}/${LIB_DIR}/${E_SUBDIR}/${slink}")
+ install(FILES "${CMAKE_BINARY_DIR}/${LIB_DIR}/${E_SUBDIR}/${slink}"
DESTINATION ${LIB_DIR}/${E_SUBDIR})
+ endif (EXISTS "${CMAKE_BINARY_DIR}/${LIB_DIR}/${E_SUBDIR}/${slink}")
endforeach(slink ${E_SYMLINKS})
endif(E_SYMLINKS AND NOT MSVC)
Modified: brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-06
16:45:52 UTC (rev 77344)
@@ -37,8 +37,6 @@
unset(CMAKE_CXX_STANDARD_REQUIRED)
unset(CMAKE_CXX_STANDARD)
-include(${CMAKE_BINARY_DIR}/superbuild.cmake)
-
###############################################################################
# Unlike the misc/tools directory components built in src/other are part of
# the distribution, not just the compilation. Hence we need to make sure of
Modified: brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -29,12 +29,14 @@
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(bson BSON_BLD
OUTPUT_FILE ${BSON_BASENAME}${BSON_SUFFIX}
STATIC_OUTPUT_FILE ${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION}"
- LINK_TARGET "${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET "${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ SYMLINKS
\"${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${BSON_MAJOR_VERSION}\"
+ LINK_TARGET \"${BSON_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
+ STATIC_LINK_TARGET \"${BSON_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
RPATH
)
ExternalProject_ByProducts(BSON_BLD ${INCLUDE_DIR}
@@ -65,6 +67,7 @@
libbson-1.0/bson-config.h
libbson-1.0/bson-clock.h
)
+ \n")
list(APPEND BRLCAD_DEPS BSON_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -31,12 +31,14 @@
-DGDAL_INST_DATA_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/gdal
DEPENDS ${PROJ4_TARGET} ${PNG_TARGET} ${ZLIB_TARGET}
)
+
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(gdal GDAL_BLD
OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${GDAL_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
RPATH
)
-
set(GDAL_EXECUTABLES gdalinfo gdallocationinfo gdal_translate gdaltransform
gdaldem gdalwarp gdalbuildvrt)
foreach(GDALEXEC ${GDAL_EXECUTABLES})
ExternalProject_Target(${GDALEXEC} GDAL_BLD
@@ -44,7 +46,6 @@
RPATH EXEC
)
endforeach(GDALEXEC ${GDAL_EXECUTABLES})
-
ExternalProject_ByProducts(GDAL_BLD ${DATA_DIR}/gdal
LICENSE.TXT
GDALLogoBW.svg
@@ -136,6 +137,7 @@
vertcs.csv
vertcs.override.csv
)
+ \n")
list(APPEND BRLCAD_DEPS GDAL_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -103,6 +103,8 @@
endif (NOT MSVC)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(itcl ITCL_BLD
SUBDIR itcl${ITCL_VERSION}
OUTPUT_FILE ${ITCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
@@ -123,6 +125,7 @@
itcl${ITCL_VERSION}/pkgIndex.tcl
FIXPATH
)
+ \n")
list(APPEND BRLCAD_DEPS ITCL_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -96,6 +96,8 @@
endif (NOT MSVC)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(itk ITK_BLD
SUBDIR itk${ITK_VERSION}
OUTPUT_FILE ${ITK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
@@ -118,6 +120,7 @@
itk${ITK_VERSION}/pkgIndex.tcl
FIXPATH
)
+ \n")
list(APPEND BRLCAD_DEPS ITK_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-06 16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-06 16:45:52 UTC (rev 77344)
@@ -82,6 +82,8 @@
endif (NOT MSVC)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_ByProducts(IWIDGETS_BLD
${LIB_DIR}/iwidgets${IWIDGETS_VERSION}
demos/buttonbox
demos/calendar
@@ -275,6 +277,7 @@
scripts/unknownimage.gif
scripts/watch.itk
)
+ \n")
list(APPEND BRLCAD_DEPS IWIDGETS_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-06 16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-06 16:45:52 UTC (rev 77344)
@@ -20,6 +20,9 @@
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
)
+
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(netpbm NETPBM_BLD
OUTPUT_FILE ${NETPBM_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${NETPBM_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -42,6 +45,7 @@
netpbm/ppmcmap.h
netpbm/ppmfloyd.h
)
+ \n")
list(APPEND BRLCAD_DEPS NETPBM_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -45,12 +45,15 @@
-DPNG_LIB_NAME=${PNG_LIB_NAME} -DPNG_PREFIX=brl_
DEPENDS ${ZLIB_TARGET}
)
+
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(png PNG_BLD
OUTPUT_FILE ${PNG_BASENAME}${PNG_SUFFIX}
STATIC_OUTPUT_FILE ${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR};${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
- LINK_TARGET "${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET "${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ SYMLINKS
\"${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PNG_VERSION_MAJOR};${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
+ LINK_TARGET \"${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
+ STATIC_LINK_TARGET \"${PNG_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
RPATH
)
ExternalProject_ByProducts(PNG_BLD ${INCLUDE_DIR}
@@ -61,6 +64,7 @@
libpng${PNG_VERSION_MAJOR}/pngconf.h
libpng${PNG_VERSION_MAJOR}/pnglibconf.h
)
+ \n")
list(APPEND BRLCAD_DEPS PNG_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-06 16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-06 16:45:52 UTC (rev 77344)
@@ -29,12 +29,15 @@
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
-DPROJ_LIB_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/proj
)
+
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(proj PROJ4_BLD
OUTPUT_FILE ${PROJ_BASENAME}${PROJ_SUFFIX}
STATIC_OUTPUT_FILE ${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION}"
- LINK_TARGET "${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET "${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ SYMLINKS
\"${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_API_VERSION}\"
+ LINK_TARGET \"${PROJ_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
+ STATIC_LINK_TARGET \"${PROJ_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
RPATH
)
@@ -58,6 +61,7 @@
proj_api.h
geodesic.h
)
+ \n")
list(APPEND BRLCAD_DEPS PROJ4_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-06 16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-06 16:45:52 UTC (rev 77344)
@@ -29,17 +29,20 @@
-DREGEX_PREFIX_STR=libregex_
)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(regex REGEX_BLD
OUTPUT_FILE ${REGEX_BASENAME}${REGEX_SUFFIX}
STATIC_OUTPUT_FILE ${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1"
- LINK_TARGET "${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET "${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ SYMLINKS
\"${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.1\"
+ LINK_TARGET \"${REGEX_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
+ STATIC_LINK_TARGET \"${REGEX_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
RPATH
)
ExternalProject_ByProducts(REGEX_BLD ${INCLUDE_DIR}
regex.h
)
+ \n")
list(APPEND BRLCAD_DEPS REGEX_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-06 16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-06 16:45:52 UTC (rev 77344)
@@ -39,12 +39,15 @@
-DINCLUDE_INSTALL_DIR=${INCLUDE_DIR}
DEPENDS ${SC_DEPS}
)
- set(STEPCODE_LIBS base express exppp stepcore stepeditor stepdai steputils)
+
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
+ set(STEPCODE_LIBS base express exppp stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
ExternalProject_Target(lib${SCLIB} STEPCODE_BLD
OUTPUT_FILE ${SC_PREFIX}${SCLIB}${SC_SUFFIX}
- SYMLINKS
"${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX};${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.2"
- LINK_TARGET "${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}"
+ SYMLINKS
\"${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX};${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.2\"
+ LINK_TARGET \"${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
RPATH
)
endforeach(SCLIB ${STEPCODE_LIBS})
@@ -56,10 +59,6 @@
)
endforeach(SCEXEC ${STEPCODE_EXECS})
- set(EXP2CXX_EXEC exp2cxx CACHE STRING "Express to C++ executable" FORCE)
- mark_as_advanced(EXP2CXX_EXEC)
- set(EXP2CXX_EXECUTABLE_TARGET exp2cxx CACHE STRING "Express to C++
executable target" FORCE)
- mark_as_advanced(EXP2CXX_EXECUTABLE_TARGET)
ExternalProject_ByProducts(STEPCODE_BLD ${INCLUDE_DIR}
stepcode/cldai/sdaiApplication_instance_set.h
stepcode/cldai/sdaiSession_instance.h
@@ -141,6 +140,7 @@
stepcode/clstepcore/Registry.h
stepcode/clstepcore/complexSupport.h
)
+ \n")
list(APPEND BRLCAD_DEPS STEPCODE_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -65,6 +65,8 @@
endif (NOT MSVC)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(tcl TCL_BLD
OUTPUT_FILE ${TCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${TCL_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -310,6 +312,7 @@
tclTomMathDecls.h
tclTomMath.h
)
+ \n")
list(APPEND BRLCAD_DEPS TCL_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -60,6 +60,8 @@
endif (NOT MSVC)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(tk TK_BLD
OUTPUT_FILE ${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
STATIC_OUTPUT_FILE ${TK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -74,7 +76,7 @@
tkConfig.sh
)
- ExternalProject_ByProducts(TK_BLD ${LIB_DIR}/tk8.${TK_MINOR_VERSION}
+ ExternalProject_ByProducts(TK_BLD ${LIB_DIR}/tk8.${TCL_MINOR_VERSION}
bgerror.tcl
button.tcl
choosedir.tcl
@@ -252,6 +254,7 @@
tk.h
tkPlatDecls.h
)
+ \n")
list(APPEND BRLCAD_DEPS TK_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
2020-10-06 16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
2020-10-06 16:45:52 UTC (rev 77344)
@@ -29,12 +29,14 @@
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
)
+ # Tell the parent build about files and libraries
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "
ExternalProject_Target(utahrle UTAHRLE_BLD
OUTPUT_FILE ${UTAHRLE_BASENAME}${UTAHRLE_SUFFIX}
STATIC_OUTPUT_FILE ${UTAHRLE_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
"${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${UTAHRLE_MAJOR_VERSION}"
- LINK_TARGET "${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- STATIC_LINK_TARGET "${UTAHRLE_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+ SYMLINKS
\"${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${UTAHRLE_MAJOR_VERSION}\"
+ LINK_TARGET \"${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
+ STATIC_LINK_TARGET \"${UTAHRLE_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
RPATH
)
ExternalProject_ByProducts(UTAHRLE_BLD ${INCLUDE_DIR}
@@ -44,6 +46,7 @@
rle_put.h
rle_raw.h
)
+ \n")
list(APPEND BRLCAD_DEPS UTAHRLE_BLD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-06
16:18:33 UTC (rev 77343)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-06
16:45:52 UTC (rev 77344)
@@ -45,7 +45,7 @@
zconf.h
zlib.h
)
- ")
+ \n")
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
