Revision: 77336
http://sourceforge.net/p/brlcad/code/77336
Author: starseeker
Date: 2020-10-06 00:39:30 +0000 (Tue, 06 Oct 2020)
Log Message:
-----------
Adjustments... going to need to look at the rpath handling to make this work,
needs updating.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-05 17:16:38 UTC
(rev 77335)
+++ brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-10-06 00:39:30 UTC
(rev 77336)
@@ -238,7 +238,7 @@
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/superbuild"
)
execute_process(
- COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/superbuild --config
Release --target all
+ COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/superbuild -j12
--config Release --target all
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/superbuild"
)
@@ -246,21 +246,27 @@
message(FATAL_ERROR "Third party library info file
${CMAKE_BINARY_DIR}/superbuild.cmake was not found.")
endif (NOT EXISTS ${CMAKE_BINARY_DIR}/superbuild.cmake)
+# Find packages based on superbuild results
include(${CMAKE_BINARY_DIR}/superbuild.cmake)
-message("LEMON_TEMPLATE: ${LEMON_TEMPLATE}")
-
find_package(LEMON)
find_package(RE2C)
find_package(PERPLEX)
+find_package(ZLIB)
+find_package(PNG)
+find_package(REGEX)
find_package(NETPBM)
-find_package(STEPCODE)
+if (BRLCAD_ENABLE_STEPCODE)
+ find_package(STEPCODE)
+endif (BRLCAD_ENABLE_STEPCODE)
#find_package(BSON)
-find_package(PROJ4)
-find_package(GDAL)
-find_package(TCL)
+if (BRLCAD_ENABLE_GDAL)
+ find_package(PROJ4)
+ find_package(GDAL)
+endif (BRLCAD_ENABLE_GDAL)
+if (BRLCAD_ENABLE_TCL)
+ find_package(TCL)
+endif (BRLCAD_ENABLE_TCL)
-message("LEMON_TEMPLATE: ${LEMON_TEMPLATE}")
-
#---------------------------------------------------------------------
# Let CMake know where to look for our counting file for configuration
# passes. It will impact whether we print certain messages
Modified: brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-05
17:16:38 UTC (rev 77335)
+++ brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-06
00:39:30 UTC (rev 77336)
@@ -37,6 +37,8 @@
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/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-05 17:16:38 UTC (rev 77335)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-06 00:39:30 UTC (rev 77336)
@@ -224,7 +224,7 @@
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(REGEX_LIBRARY
\"${BRLCAD_BINARY_DIR}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\")\n")
+ file(APPEND "${BRLCAD_BINARY_DIR}/superbuild.cmake" "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")
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
