Revision: 77414
http://sourceforge.net/p/brlcad/code/77414
Author: starseeker
Date: 2020-10-13 19:00:33 +0000 (Tue, 13 Oct 2020)
Log Message:
-----------
Add reset variables for flipping between configurations.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
brlcad/branches/thirdparty_rework/src/superbuild/gdal.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/tcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-13 18:11:14 UTC (rev 77413)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-13 19:00:33 UTC (rev 77414)
@@ -139,7 +139,6 @@
else()
set(IMPORT_PREFIX "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif(ET_STATIC)
- message("prefix: ${IMPORT_PREFIX}")
if(IN_IMPORT_PREFIX)
set(IMPORT_PREFIX "${IMPORT_PREFIX}/${IN_IMPORT_PREFIX}")
endif(IN_IMPORT_PREFIX)
@@ -155,9 +154,6 @@
IMPORTED_SONAME_NOCONFIG "${IN_LINK_TARGET}"
)
- message("${IMPORT_PREFIX}/${IN_LINK_TARGET}")
- message("${IN_LINK_TARGET}")
-
else(NOT CMAKE_CONFIGURATION_TYPES)
foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
@@ -187,10 +183,6 @@
set(IMPORT_PREFIX "${IMPORT_PREFIX}/${IN_IMPORT_PREFIX}")
endif(IN_IMPORT_PREFIX)
- message("IMPORT_PREFIX: ${IMPORT_PREFIX}")
-
- message("LINK_TARGET: ${LINK_TARGET}")
-
set_target_properties(${etarg} PROPERTIES
IMPORTED_LOCATION_${CFG_TYPE_UPPER} "${IMPORT_PREFIX}/${LINK_TARGET}"
IMPORTED_SONAME_${CFG_TYPE_UPPER} "${LINK_TARGET}"
@@ -293,8 +285,6 @@
message(FATAL_ERROR "Target ${etarg}-static is already defined\n")
endif(E_STATIC AND TARGET ${etarg}-static)
- message("${extproj}: Adding target \"${etarg}\"")
-
if (E_LINK_TARGET AND NOT MSVC)
set(LINK_TARGET "${E_LINK_TARGET}")
endif (E_LINK_TARGET AND NOT MSVC)
@@ -322,8 +312,6 @@
# CMake project, we need to install as either FILES or PROGRAMS
set(TOUT)
- message("Adding target: ${etarg}")
-
# Handle shared library
if (E_SHARED)
add_library(${etarg} SHARED IMPORTED GLOBAL)
@@ -372,7 +360,6 @@
string(REPLACE "${BIN_DIR}/" "" ENAME ${E_EXEC})
fcfgcpy(TOUT ${extproj} ${extroot} ${BIN_DIR} ${E_EXEC} ${ENAME})
- message("TOUT: ${TOUT}")
string(REPLACE "${BIN_DIR}/" "" ENAME ${E_EXEC})
ET_target_props(${etarg} "${E_IMPORT_PREFIX}" ${ENAME} EXEC)
install(PROGRAMS "${CMAKE_BINARY_DIR}/$<CONFIG>/${E_EXEC}" DESTINATION
${BIN_DIR}/${E_SUBDIR})
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
2020-10-13 18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMake/ThirdParty.cmake
2020-10-13 19:00:33 UTC (rev 77414)
@@ -190,15 +190,15 @@
set(${vroot}_FOUND_STATUS ${${vroot}_FOUND})
# Initialize (or rather, uninitialize) variables in preparation for search
- set(${vroot}_FOUND "${vroot}-NOTFOUND" CACHE STRING "${vroot}_FOUND" FORCE)
+ unset(${vroot}_FOUND CACHE)
mark_as_advanced(${vroot}_FOUND)
foreach(item ${TP_RESET_VARS})
- set(${item} "${vroot}-NOTFOUND" CACHE STRING "${item}" FORCE)
+ unset(${item} CACHE)
endforeach(item ${TP_RESET_VARS})
# Be quiet if we're doing this over
if("${${vroot}_FOUND_STATUS}" MATCHES "NOTFOUND")
- set(${vroot}_FIND_QUIETLY TRUE)
+ #set(${vroot}_FIND_QUIETLY TRUE)
endif("${${vroot}_FOUND_STATUS}" MATCHES "NOTFOUND")
# Find the package in question. It is the toplevel CMakeLists.txt's
responsibility to make
Modified: brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake 2020-10-13
18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/bson.cmake 2020-10-13
19:00:33 UTC (rev 77414)
@@ -5,7 +5,13 @@
provided with BRL-CAD's source code. Default is BUNDLED, using
the included other/src version.
")
-THIRD_PARTY(bson BSON Libbson libbson_DESCRIPTION ALIASES ENABLE_BSON
REQUIRED_VARS BRLCAD_ENABLE_BINARY_ATTRIBUTES FLAGS NOSYS UNDOCUMENTED)
+THIRD_PARTY(bson BSON Libbson
+ libbson_DESCRIPTION
+ ALIASES ENABLE_BSON
+ REQUIRED_VARS BRLCAD_ENABLE_BINARY_ATTRIBUTES
+ FLAGS NOSYS UNDOCUMENTED
+ RESET_VARS BSON_LIBRARY BSON_INCLUDE_DIR
+ )
if (BRLCAD_BSON_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-13
18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-13
19:00:33 UTC (rev 77414)
@@ -5,7 +5,12 @@
testing first for a system version if BRLCAD_BUNDLED_LIBS is also
AUTO.
")
-THIRD_PARTY(gdal GDAL gdal gdal_DESCRIPTION REQUIRED_VARS
"BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2" ALIASES ENABLE_GDAL)
+THIRD_PARTY(gdal GDAL gdal
+ gdal_DESCRIPTION
+ REQUIRED_VARS "BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2"
+ ALIASES ENABLE_GDAL
+ RESET_VARS GDAL_LIBRARY GDAL_LIBRARIES GDAL_INCLUDE_DIR GDAL_INCLUDE_DIRS
+ )
if (BRLCAD_GDAL_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-13 18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-13 19:00:33 UTC (rev 77414)
@@ -4,7 +4,12 @@
the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(netpbm NETPBM netpbm netpbm_DESCRIPTION REQUIRED_VARS
BRLCAD_LEVEL2 ALIASES ENABLE_NETPBM)
+THIRD_PARTY(netpbm NETPBM netpbm
+ netpbm_DESCRIPTION
+ REQUIRED_VARS BRLCAD_LEVEL2
+ ALIASES ENABLE_NETPBM
+ RESET_VARS NETPBM_LIBRARY NETPBM_INCLUDE_DIR
+ )
if (BRLCAD_NETPBM_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-13
18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-13
19:00:33 UTC (rev 77414)
@@ -14,7 +14,12 @@
# We generally don't want the Mac framework libpng...
set(CMAKE_FIND_FRAMEWORK LAST)
-THIRD_PARTY(png PNG png png_DESCRIPTION REQUIRED_VARS BRLCAD_LEVEL2 ALIASES
ENABLE_PNG)
+THIRD_PARTY(png PNG png
+ png_DESCRIPTION
+ REQUIRED_VARS BRLCAD_LEVEL2
+ ALIASES ENABLE_PNG
+ RESET_VARS PNG_LIBRARY_DEBUG PNG_LIBRARY_RELEASE
+ )
if (BRLCAD_PNG_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-13 18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-13 19:00:33 UTC (rev 77414)
@@ -5,7 +5,12 @@
testing first for a system version if BRLCAD_BUNDLED_LIBS is also
AUTO.
")
-THIRD_PARTY(proj-4 PROJ4 proj4 proj4_DESCRIPTION REQUIRED_VARS
"BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2" ALIASES ENABLE_PROJ4)
+THIRD_PARTY(proj-4 PROJ4 proj4
+ proj4_DESCRIPTION
+ REQUIRED_VARS "BRLCAD_ENABLE_GDAL;BRLCAD_LEVEL2"
+ ALIASES ENABLE_PROJ4
+ RESET_VARS PROJ4_LIBRARY PROJ4_LIBRARIES PROJ4_INCLUDE_DIR PROJ4_INCLUDE_DIRS
+ )
if (BRLCAD_PROJ4_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-13 18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-13 19:00:33 UTC (rev 77414)
@@ -5,7 +5,11 @@
and testing first for a system version if BRLCAD_BUNDLED_LIBS is also
AUTO.
")
-THIRD_PARTY(regex REGEX regex regex_DESCRIPTION ALIASES ENABLE_REGEX)
+THIRD_PARTY(regex REGEX regex
+ regex_DESCRIPTION
+ ALIASES ENABLE_REGEX
+ RESET_VARS REGEX_LIBRARY REGEX_LIBRARIES REGEX_INCLUDE_DIR REGEX_INCLUDE_DIRS
+ )
if (BRLCAD_REGEX_BUILD)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-13
18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-13
19:00:33 UTC (rev 77414)
@@ -5,7 +5,12 @@
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(tcl TCL tcl tcl_DESCRIPTION ALIASES ENABLE_TCL REQUIRED_VARS
"BRLCAD_LEVEL2;BRLCAD_ENABLE_TCL")
+THIRD_PARTY(tcl TCL tcl
+ tcl_DESCRIPTION
+ ALIASES ENABLE_TCL
+ REQUIRED_VARS "BRLCAD_LEVEL2;BRLCAD_ENABLE_TCL"
+ RESET_VARS TCL_LIBRARY TCL_LIBRARIES TCL_STUB_LIBRARY TCL_TCLSH
TCL_INCLUDE_PATH TCL_INCLUDE_DIRS
+ )
if (BRLCAD_TCL_BUILD)
@@ -336,22 +341,6 @@
set(TCL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
- #if (CMAKE_CONFIGURATION_TYPES)
- # set(TCL_LIBRARY
"${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${TCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_LIBRARIES ${TCL_LIBRARY} CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_STUB_LIBRARY
"${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${TCL_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_TCLSH
"${CMAKE_BINARY_DIR}/$<CONFIG>/${BIN_DIR}/tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${EXE_EXT}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_INCLUDE_PATH "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
- # set(TCL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
- #else (CMAKE_CONFIGURATION_TYPES)
- # set(TCL_LIBRARY
"${CMAKE_BINARY_DIR}/${LIB_DIR}/${TCL_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_LIBRARIES ${TCL_LIBRARY} CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_STUB_LIBRARY
"${CMAKE_BINARY_DIR}/${LIB_DIR}/${TCL_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_TCLSH
"${CMAKE_BINARY_DIR}/${BIN_DIR}/tclsh${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${EXE_EXT}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TCL_INCLUDE_PATH "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
- # set(TCL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
- #endif (CMAKE_CONFIGURATION_TYPES)
-
SetTargetFolder(TCL_BLD "Third Party Libraries")
SetTargetFolder(tcl "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-13
18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-13
19:00:33 UTC (rev 77414)
@@ -229,6 +229,10 @@
SetTargetFolder(TK_BLD "Third Party Libraries")
SetTargetFolder(tk "Third Party Libraries")
+elseif (BRLCAD_ENABLE_TCL AND BRLCAD_ENABLE_TK)
+
+ set(HAVE_TK 1 CACHE STRING "C level Tk flag" FORCE)
+
endif (BRLCAD_ENABLE_TCL AND BRLCAD_ENABLE_TK AND TK_DO_BUILD)
# Local Variables:
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-13
18:11:14 UTC (rev 77413)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-13
19:00:33 UTC (rev 77414)
@@ -5,7 +5,11 @@
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(libz ZLIB zlib zlib_DESCRIPTION ALIASES ENABLE_ZLIB ENABLE_LIBZ)
+THIRD_PARTY(libz ZLIB zlib
+ zlib_DESCRIPTION
+ ALIASES ENABLE_ZLIB ENABLE_LIBZ
+ RESET_VARS ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIR ZLIB_INCLUDE_DIRS
ZLIB_LIBRARY_DEBUG ZLIB_LIBRARY_RELEASE
+ )
if (BRLCAD_ZLIB_BUILD)
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
