Revision: 70089
http://sourceforge.net/p/brlcad/code/70089
Author: starseeker
Date: 2017-08-17 21:58:28 +0000 (Thu, 17 Aug 2017)
Log Message:
-----------
cmake_parse_arguments lets do some things better - list aliases as direct
arguments rather than adding a layer of indirection via variable name. Still
need to propagate cmake_parse_arguments usage through other 3rd party logic,
but its a start.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Options.cmake
brlcad/trunk/misc/CMake/ThirdParty.cmake
brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake
brlcad/trunk/src/other/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2017-08-17 21:29:40 UTC (rev 70088)
+++ brlcad/trunk/CMakeLists.txt 2017-08-17 21:58:28 UTC (rev 70089)
@@ -1099,7 +1099,6 @@
# build packages for a distribution. If both of these options are
# on the enabling of local packages is the "senior" option and will
# force the system libs option to off.
-set(BRLCAD_BUNDLED_LIBS_ALIASES "ENABLE_ALL")
set(BRLCAD_BUNDLED_LIBS_DESCRIPTION "
Enables compilation of all 3rd party sources that are provided within a BRL-CAD
source distribution. If used this option sets all other 3rd party library
@@ -1116,7 +1115,7 @@
endif(MSVC)
BRLCAD_OPTION(BRLCAD_BUNDLED_LIBS ${BRLCAD_BUNDLED_LIBS_DEFAULT}
TYPE ABS
- ALIASES BRLCAD_BUNDLED_LIBS_ALIASES
+ ALIASES ENABLE_ALL
DESCRIPTION BRLCAD_BUNDLED_LIBS_DESCRIPTION)
if(NOT BRLCAD_BUNDLED_LIBS MATCHES "AUTO" AND NOT BRLCAD_BUNDLED_LIBS MATCHES
"BUNDLED" AND NOT BRLCAD_BUNDLED_LIBS MATCHES "SYSTEM")
message(WARNING "Unknown value BRLCAD_BUNDLED_LIBS supplied for
BRLCAD_BUNDLED_LIBS (${BRLCAD_BUNDLED_LIBS}) - defaulting to AUTO")
@@ -1190,9 +1189,6 @@
include(FindGL)
endif(NOT BRLCAD_ENABLE_X11 AND NOT BRLCAD_ENABLE_AQUA AND NOT WIN32)
-set(BRLCAD_ENABLE_OPENGL_ALIASES
- ENABLE_OPENGL
- )
set(BRLCAD_ENABLE_OPENGL_DESCRIPTION "
Enable support for OpenGL based Display Managers in BRL-CAD.
Default depends on whether OpenGL is successfully detected -
@@ -1200,7 +1196,7 @@
")
BRLCAD_OPTION(BRLCAD_ENABLE_OPENGL ${OPENGL_FOUND}
TYPE BOOL
- ALIASES BRLCAD_ENABLE_OPENGL_ALIASES
+ ALIASES ENABLE_OPENGL
DESCRIPTION BRLCAD_ENABLE_OPENGL_DESCRIPTION)
# Enable RTGL. Requires an enabled OpenGL.
@@ -1286,7 +1282,7 @@
")
BRLCAD_OPTION(BRLCAD_ENABLE_RUNTIME_DEBUG ON
TYPE BOOL
- ALIASES BRLCAD_ENABLE_RUNTIME_DEBUG_ALIASES
+ ALIASES ${BRLCAD_ENABLE_RUNTIME_DEBUG_ALIASES}
DESCRIPTION BRLCAD_ENABLE_RUNTIME_DEBUG_DESCRIPTION)
mark_as_advanced(BRLCAD_ENABLE_RUNTIME_DEBUG)
if(NOT BRLCAD_ENABLE_RUNTIME_DEBUG)
@@ -1308,17 +1304,12 @@
# Enable debug flags during compilation - we always want to use these
# unless explicitly told not to.
-set(BRLCAD_FLAGS_DEBUG_ALIASES
- ENABLE_DEBUG
- ENABLE_FLAGS_DEBUG
- ENABLE_DEBUG_FLAGS
- )
set(BRLCAD_FLAGS_DEBUG_DESCRIPTION "
Add compiler flags to aid in program debugging. Defaults to ON.
")
BRLCAD_OPTION(BRLCAD_FLAGS_DEBUG ON
TYPE BOOL
- ALIASES BRLCAD_FLAGS_DEBUG_ALIASES
+ ALIASES ENABLE_DEBUG ENABLE_FLAGS_DEBUG ENABLE_DEBUG_FLAGS
DESCRIPTION BRLCAD_FLAGS_DEBUG_DESCRIPTION)
# A variety of debugging messages in the code key off of the DEBUG
@@ -1328,16 +1319,12 @@
endif(BRLCAD_FLAGS_DEBUG)
# Build with compiler warning flags
-set(BRLCAD_ENABLE_COMPILER_WARNINGS_ALIASES
- ENABLE_WARNINGS
- ENABLE_COMPILER_WARNINGS
- )
set(BRLCAD_ENABLE_COMPILER_WARNINGS_DESCRIPTION "
Use extra compiler warning flags when compiling C/C++ code. Defaults to ON.
")
BRLCAD_OPTION(BRLCAD_ENABLE_COMPILER_WARNINGS ON
TYPE BOOL
- ALIASES BRLCAD_ENABLE_COMPILER_WARNINGS_ALIASES
+ ALIASES ENABLE_WARNINGS ENABLE_COMPILER_WARNINGS
DESCRIPTION BRLCAD_ENABLE_COMPILER_WARNINGS_DESCRIPTION)
mark_as_advanced(BRLCAD_ENABLE_COMPILER_WARNINGS)
@@ -1346,10 +1333,6 @@
# code unless the NO_STRICT option is specified when defining a target
# with BRLCAD_ADDEXEC or BRLCAD_ADDLIB. If only C++ files in a target
# are not compatible with strict, the NO_STRICT_CXX option can be used.
-set(BRLCAD_ENABLE_STRICT_ALIASES
- ENABLE_STRICT
- ENABLE_STRICT_COMPILE
- ENABLE_STRICT_COMPILE_FLAGS)
set(BRLCAD_ENABLE_STRICT_DESCRIPTION "
Causes all compilation warnings for C code to be treated as errors. This is
now
the default for BRL-CAD source code, and developers should address issues
@@ -1358,7 +1341,7 @@
")
BRLCAD_OPTION(BRLCAD_ENABLE_STRICT ON
TYPE BOOL
- ALIASES BRLCAD_ENABLE_STRICT_ALIASES
+ ALIASES ENABLE_STRICT ENABLE_STRICT_COMPILE ENABLE_STRICT_COMPILE_FLAGS
DESCRIPTION BRLCAD_ENABLE_STRICT_DESCRIPTION)
if(BRLCAD_ENABLE_STRICT)
mark_as_advanced(BRLCAD_ENABLE_STRICT)
@@ -1390,7 +1373,6 @@
#====== ALL CXX COMPILE ===================
# Build all C and C++ files with a C++ compiler
-set(ENABLE_ALL_CXX_COMPILE_ALIASES "ENABLE_ALL_CXX")
set(ENABLE_ALL_CXX_COMPILE_DESCRIPTION "
Build all C and C++ files with a C++ compiler. Defaults to OFF.
@@ -1398,7 +1380,7 @@
")
BRLCAD_OPTION(ENABLE_ALL_CXX_COMPILE OFF
TYPE BOOL
- ALIASES ENABLE_ALL_CXX_COMPILE_ALIASES
+ ALIASES ENABLE_ALL_CXX
DESCRIPTION ENABLE_ALL_CXX_COMPILE_DESCRIPTION)
mark_as_advanced(ENABLE_ALL_CXX_COMPILE)
@@ -1408,7 +1390,6 @@
#====== POSIX ===================
# Build with strict POSIX compliance checking
-set(ENABLE_POSIX_COMPLIANCE_ALIASES "ENABLE_POSIX")
set(ENABLE_POSIX_COMPLIANCE_DESCRIPTION "
Build with strict POSIX compliance checking. Defaults to OFF.
@@ -1419,12 +1400,11 @@
")
BRLCAD_OPTION(ENABLE_POSIX_COMPLIANCE OFF
TYPE BOOL
- ALIASES ENABLE_POSIX_COMPLIANCE_ALIASES
+ ALIASES ENABLE_POSIX
DESCRIPTION ENABLE_POSIX_COMPLIANCE_DESCRIPTION)
mark_as_advanced(ENABLE_POSIX_COMPLIANCE)
#== ISO C ==
-set(ENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE_ALIASES "STRICT_ISO_C")
set(ENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE_DESCRIPTION "
Build with strict ISO C compliance checking. Defaults to OFF.
@@ -1433,7 +1413,7 @@
")
BRLCAD_OPTION(ENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE OFF
TYPE BOOL
- ALIASES ENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE_ALIASES
+ ALIASES STRICT_ISO_C
DESCRIPTION ENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE_DESCRIPTION)
mark_as_advanced(ENABLE_STRICT_COMPILER_STANDARD_COMPLIANCE)
@@ -1505,11 +1485,6 @@
else(NOT BRLCAD_ENABLE_TARGETS OR "${BRLCAD_ENABLE_TARGETS}" GREATER 2)
set(EXTRADOCS_DEFAULT "OFF")
endif(NOT BRLCAD_ENABLE_TARGETS OR "${BRLCAD_ENABLE_TARGETS}" GREATER 2)
-set(BRLCAD_EXTRADOCS_ALIASES
- ENABLE_DOCS
- ENABLE_EXTRA_DOCS
- ENABLE_DOCBOOK
- )
set(BRLCAD_EXTRADOCS_DESCRIPTION "
The core option that enables and disables building of BRL-CAD's
DocBook based documentation (includes manuals and man pages for
@@ -1522,7 +1497,7 @@
")
BRLCAD_OPTION(BRLCAD_EXTRADOCS ${EXTRADOCS_DEFAULT}
TYPE BOOL
- ALIASES BRLCAD_EXTRADOCS_ALIASES
+ ALIASES ENABLE_DOCS ENABLE_EXTRA_DOCS ENABLE_DOCBOOK
DESCRIPTION BRLCAD_EXTRADOCS_DESCRIPTION)
Modified: brlcad/trunk/misc/CMake/BRLCAD_Options.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Options.cmake 2017-08-17 21:29:40 UTC
(rev 70088)
+++ brlcad/trunk/misc/CMake/BRLCAD_Options.cmake 2017-08-17 21:58:28 UTC
(rev 70089)
@@ -49,7 +49,7 @@
function(WRITE_CONFIG_YN opt opt_ALIASES onval offval)
set(ofile "${CMAKE_BINARY_DIR}/configure.new")
- foreach(item ${${opt_ALIASES}})
+ foreach(item ${opt_ALIASES})
string(TOLOWER ${item} alias_str)
string(REPLACE "_" "-" alias_str "${alias_str}")
string(REPLACE "enable" "disable" disable_str "${alias_str}")
@@ -57,16 +57,16 @@
file(APPEND "${ofile}" " shift;;\n")
file(APPEND "${ofile}" " --${disable_str})
options=\"$options -D${opt}=${offval}\";\n")
file(APPEND "${ofile}" " shift;;\n")
- endforeach(item ${${opt_ALIASES}})
+ endforeach(item ${opt_ALIASES})
endfunction(WRITE_CONFIG_YN)
function(WRITE_CONFIG_STR opt opt_ALIASES)
- foreach(item ${${opt_ALIASES}})
+ foreach(item ${opt_ALIASES})
string(TOLOWER ${item} alias_str)
file(APPEND "${ofile}" " --${alias_str}=*)
inputstr=$1;\n")
file(APPEND "${ofile}" "
options=\"$options -D${opt}=\${inputstr#--${alias_str}=}\";\n")
file(APPEND "${ofile}" " shift;;\n")
- endforeach(item ${${opt_ALIASES}})
+ endforeach(item ${opt_ALIASES})
endfunction(WRITE_CONFIG_STR)
function(WRITE_CONFIG_OPTS opt opt_ALIASES style)
@@ -96,13 +96,13 @@
set(lopt ${${ropt}})
- foreach(item ${${opt_ALIASES}})
+ foreach(item ${opt_ALIASES})
if(NOT "${item}" STREQUAL "${opt}" AND NOT "${${item}}" STREQUAL "")
set(lopt ${${item}})
set(${item} "" CACHE STRING "set ${opt} via this variable" FORCE)
mark_as_advanced(${item})
endif(NOT "${item}" STREQUAL "${opt}" AND NOT "${${item}}" STREQUAL "")
- endforeach(item ${${opt_ALIASES}})
+ endforeach(item ${opt_ALIASES})
# String types don't have inverses
if("${style}" STREQUAL "STRING")
@@ -111,19 +111,19 @@
endif("${style}" STREQUAL "STRING")
# Generate inverse aliases for all "ENABLE" options
- foreach(item ${${opt_ALIASES}})
+ foreach(item ${opt_ALIASES})
string(REPLACE "ENABLE_" "DISABLE_" inverse_item ${item})
set(inverse_aliases ${inverse_aliases} ${inverse_item})
- endforeach(item ${${opt_ALIASES}})
+ endforeach(item ${opt_ALIASES})
# Check the inverse options for a set value
- foreach(item ${${opt_ALIASES}})
+ foreach(item ${opt_ALIASES})
if(NOT "${${item}}" STREQUAL "")
set(lopt ${${item}})
set(${item} "" CACHE STRING "set ${opt} via this variable" FORCE)
mark_as_advanced(${item})
endif(NOT "${${item}}" STREQUAL "")
- endforeach(item ${${opt_ALIASES}})
+ endforeach(item ${opt_ALIASES})
# Let the parent scope know the result
set(${ropt} ${lopt} PARENT_SCOPE)
@@ -139,7 +139,7 @@
file(APPEND "${ofile}" "${${opt_DESCRIPTION}}")
set(ALIASES_LIST "\nAliases: ")
- foreach(item ${${opt_ALIASES}})
+ foreach(item ${opt_ALIASES})
set(ALIASES_LIST_TEST "${ALIASES_LIST}, ${item}")
string(LENGTH ${ALIASES_LIST_TEST} LL)
@@ -157,7 +157,7 @@
endif(NOT ${ALIASES_LIST} STREQUAL "\nAliases: ")
endif(NOT ${ALIASES_LIST} MATCHES "\nAliases")
endif(${LL} GREATER 80)
- endforeach(item ${${opt_ALIASES}})
+ endforeach(item ${opt_ALIASES})
if(ALIASES_LIST)
string(STRIP ALIASES_LIST ${ALIASES_LIST})
@@ -226,6 +226,8 @@
set(otype ${O_TYPE})
endif(O_TYPE)
+ message("O_ALIASES: ${O_ALIASES}")
+
# Process aliases and write descriptions
if(O_ALIASES)
OPTION_RESOLVE_ALIASES(lopt "${opt}" "${O_ALIASES}" "${otype}")
Modified: brlcad/trunk/misc/CMake/ThirdParty.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty.cmake 2017-08-17 21:29:40 UTC (rev
70088)
+++ brlcad/trunk/misc/CMake/ThirdParty.cmake 2017-08-17 21:58:28 UTC (rev
70089)
@@ -267,7 +267,7 @@
if(NOT ${varname_root}_UNDOCUMENTED)
BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${varname_root}"
"${${CMAKE_PROJECT_NAME}_${varname_root}}"
TYPE ABS
- ALIASES "${varname_root}_ALIASES"
+ ALIASES ${${varname_root}_ALIASES}
DESCRIPTION "${description}")
endif(NOT ${varname_root}_UNDOCUMENTED)
@@ -549,7 +549,7 @@
BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${upper}"
"${${CMAKE_PROJECT_NAME}_${upper}}"
TYPE ABS
- ALIASES "${aliases}"
+ ALIASES ${${aliases}}
DESCRIPTION "${description}")
mark_as_advanced(${upper}_EXECUTABLE)
Modified: brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake 2017-08-17 21:29:40 UTC
(rev 70088)
+++ brlcad/trunk/misc/CMake/ThirdParty_TCL.cmake 2017-08-17 21:58:28 UTC
(rev 70089)
@@ -391,7 +391,7 @@
BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}"
"${${CMAKE_PROJECT_NAME}_${PKGNAME_UPPER}}"
TYPE ABS
- ALIASES "${aliases}"
+ ALIASES ${${aliases}}
DESCRIPTION "${description}")
endmacro(THIRD_PARTY_TCL_PACKAGE)
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2017-08-17 21:29:40 UTC (rev
70088)
+++ brlcad/trunk/src/other/CMakeLists.txt 2017-08-17 21:58:28 UTC (rev
70089)
@@ -57,7 +57,6 @@
endforeach(ITEM ${dlists})
# libregex library - often needed by tools, so do this one first.
-set(regex_ALIASES ENABLE_REGEX)
set(regex_DESCRIPTION "
Option for enabling and disabling compilation of the Regular
Expression Library provided with BRL-CAD's source distribution.
@@ -65,7 +64,7 @@
and testing first for a system version if BRLCAD_BUNDLED_LIBS is also
AUTO.
")
-THIRD_PARTY(libregex REGEX regex regex_DESCRIPTION ALIASES ${regex_ALIASES})
+THIRD_PARTY(libregex REGEX regex regex_DESCRIPTION ALIASES ENABLE_REGEX)
BRLCAD_INCLUDE_FILE(regex.h HAVE_REGEX_H)
SetTargetFolder(regex "Third Party Libraries")
SetTargetFolder(regex-static "Third Party Libraries")
@@ -101,7 +100,6 @@
endif(BUILD_SHARED_LIBS AND HAVE_LIBC_REGEX AND "${BRLCAD_REGEX}" MATCHES
"BUNDLED")
# Same deal for zlib Library - common requirement, deal with it up front
-set(zlib_ALIASES ENABLE_ZLIB ENABLE_LIBZ)
set(zlib_DESCRIPTION "
Option for enabling and disabling compilation of the zlib library
provided with BRL-CAD's source distribution. Default is AUTO,
@@ -108,7 +106,7 @@
responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(libz ZLIB zlib zlib_DESCRIPTION ALIASES ${zlib_ALIASES} FIND_NAME
BRLCADZLIB)
+THIRD_PARTY(libz ZLIB zlib zlib_DESCRIPTION ALIASES ENABLE_ZLIB ENABLE_LIBZ
FIND_NAME BRLCADZLIB)
DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/libz/CTestTestfile.cmake")
SetTargetFolder(zlib "Third Party Libraries")
SetTargetFolder(zlib-static "Third Party Libraries")
@@ -116,7 +114,6 @@
SetTargetFolder(minigzip "Third Party Executables")
# tinycthread Library - C11 style threads portability wrapper
-set(tinycthread_ALIASES ENABLE_TINYCTHREAD)
set(tinycthread_DESCRIPTION "
Option for enabling and disabling compilation of the tinycthread library
provided with BRL-CAD's source distribution. Default is AUTO,
@@ -123,13 +120,12 @@
responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(tinycthread TINYCTHREAD tinycthread tinycthread_DESCRIPTION
ALIASES ${tinycthread_ALIASES})
+THIRD_PARTY(tinycthread TINYCTHREAD tinycthread tinycthread_DESCRIPTION
ALIASES ENABLE_TINYCTHREAD)
SetTargetFolder(tinycthread "Third Party Libraries")
SetTargetFolder(tinycthread-static "Third Party Libraries")
# LZ4 compression/decompression library
-set(lz4_ALIASES ENABLE_LZ4)
set(lz4_DESCRIPTION "
Option for enabling and disabling compilation of the lz4 data
compression library provided with BRL-CAD's source code. Default
@@ -137,7 +133,7 @@
testing first for a system version if BRLCAD_BUNDLED_LIBS is also
AUTO.
")
-THIRD_PARTY(lz4 LZ4 lz4 lz4_DESCRIPTION ALIASES ${lz4_ALIASES})
+THIRD_PARTY(lz4 LZ4 lz4 lz4_DESCRIPTION ALIASES ENABLE_LZ4)
if(BRLCAD_LZ4_BUILD)
set(LIBLZ4_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/lz4" CACHE STRING
"Directory containing lz4 headers." FORCE)
mark_as_advanced(LIBLZ4_INCLUDE_DIR)
@@ -147,7 +143,6 @@
# FreeType Libraries
-set(freetype_ALIASES ENABLE_FREETYPE)
set(freetype_DESCRIPTION "
Option for enabling and disabling compilation of the FreeType
libraries provided with BRL-CAD's source code. Default is AUTO, responsive to
@@ -156,7 +151,7 @@
")
# We don't want the Freetype distribution build targets
set(FREETYPE_NO_DIST 1)
-THIRD_PARTY(freetype FREETYPE ft freetype_DESCRIPTION BRLCAD_LEVEL3 ALIASES
${freetype_ALIASES} REQUIRED_VARS "BRLCAD_ENABLE_OSG;BRLCAD_LEVEL3" FIND_NAME
Freetype)
+THIRD_PARTY(freetype FREETYPE ft freetype_DESCRIPTION BRLCAD_LEVEL3 ALIASES
ENABLE_FREETYPE REQUIRED_VARS "BRLCAD_ENABLE_OSG;BRLCAD_LEVEL3" FIND_NAME
Freetype)
if(BRLCAD_FREETYPE_BUILD)
set(FREETYPE_LIBRARY freetype CACHE STRING "libfreetype" FORCE)
set(FREETYPE_INCLUDE_DIR_freetype2
@@ -201,7 +196,6 @@
endif(WIN32)
mark_as_advanced(HAVE_TERMLIB)
-set(termlib_ALIASES ENABLE_TERMLIB)
set(termlib_DESCRIPTION "
Option for enabling and disabling compilation of the termlib library
provided with BRL-CAD's source distribution. Default is AUTO,
@@ -211,7 +205,7 @@
disabled. Windows does not support the termlib API.)
")
THIRD_PARTY(libtermlib TERMLIB termlib termlib_DESCRIPTION REQUIRED_VARS
HAVE_TERMLIB
- BRLCAD_LEVEL2 ALIASES ${termlib_ALIASES})
+ BRLCAD_LEVEL2 ALIASES ENABLE_TERMLIB)
if(BRLCAD_TERMLIB_BUILD)
set(HAVE_TERMCAP_H ON CACHE BOOL "src/other termlib is on" FORCE)
mark_as_advanced(HAVE_TERMCAP_H)
@@ -218,7 +212,6 @@
endif(BRLCAD_TERMLIB_BUILD)
# libnetpbm Library support for pnm,ppm,pbm, etc. image files
-set(netpbm_ALIASES ENABLE_NETPBM)
set(netpbm_DESCRIPTION "
Option for enabling and disabling compilation of the netpbm library
provided with BRL-CAD's source code. Default is AUTO, responsive to
@@ -225,7 +218,7 @@
the toplevel BRLCAD_BUNDLED_LIBS option and testing first for a system
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(libnetpbm NETPBM netpbm netpbm_DESCRIPTION REQUIRED_VARS
BRLCAD_LEVEL2 ALIASES ${netpbm_ALIASES})
+THIRD_PARTY(libnetpbm NETPBM netpbm netpbm_DESCRIPTION REQUIRED_VARS
BRLCAD_LEVEL2 ALIASES ENABLE_NETPBM)
if(BRLCAD_NETPBM_BUILD)
SetTargetFolder(libnetpbm "Third Party Libraries")
SetTargetFolder(libnetpbm-static "Third Party Libraries")
@@ -265,7 +258,6 @@
mark_as_advanced(DFA_XTRA)
mark_as_advanced(AWK)
set(CMAKE_INSTALL_LIBDIR ${LIB_DIR})
-set(png_ALIASES ENABLE_PNG)
set(png_DESCRIPTION "
Option for enabling and disabling compilation of the Portable Network
Graphics library provided with BRL-CAD's source distribution. Default
@@ -276,7 +268,7 @@
# Note - we don't actually know the libpng build target name for the
# shared library at this point - use png as a stub and override
# once we know what PNG_LIB_NAME is.
-THIRD_PARTY(libpng PNG png png_DESCRIPTION REQUIRED_VARS BRLCAD_LEVEL2 ALIASES
${png_ALIASES})
+THIRD_PARTY(libpng PNG png png_DESCRIPTION REQUIRED_VARS BRLCAD_LEVEL2 ALIASES
ENABLE_PNG)
if(BRLCAD_PNG_BUILD)
set(PNG_LIBRARY png CACHE STRING "PNG_LIBRARY" FORCE)
@@ -335,7 +327,6 @@
# and the include directory for utahrle are different, so override the
# macro's setting of UTAHRLE_INCLUDE_DIR here.
set(UTAHRLE_HAVE_COMMON_H 1)
-set(utahrle_ALIASES ENABLE_UTAHRLE)
set(utahrle_DESCRIPTION "
Option for enabling and disabling compilation of the Utah Raster
Toolkit library provided with BRL-CAD's source code. Default is AUTO,
@@ -343,7 +334,7 @@
first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
THIRD_PARTY(libutahrle UTAHRLE utahrle utahrle_DESCRIPTION REQUIRED_VARS
BRLCAD_LEVEL3
- ALIASES ${utahrle_ALIASES} FLAGS NOSYS)
+ ALIASES ENABLE_UTAHRLE FLAGS NOSYS)
if(BRLCAD_UTAHRLE_BUILD)
SetTargetFolder(utahrle "Third Party Libraries")
SetTargetFolder(utahrle-static "Third Party Libraries")
@@ -378,7 +369,6 @@
set(TK_DISABLE_MANPAGES ON CACHE BOOL "disable Tk man page generation" FORCE)
mark_as_advanced(TK_DISABLE_MANPAGES)
-set(tcl_ALIASES ENABLE_TCL)
set(tcl_DESCRIPTION "
Option for enabling and disabling compilation of the Tcl library
provided with BRL-CAD's source code. Default is AUTO, responsive to
@@ -386,7 +376,7 @@
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(tcl TCL tcl tcl_DESCRIPTION ALIASES ${tcl_ALIASES} FIND_NAME
BRLCADTCL REQUIRED_VARS BRLCAD_LEVEL2)
+THIRD_PARTY(tcl TCL tcl tcl_DESCRIPTION ALIASES ENABLE_TCL FIND_NAME BRLCADTCL
REQUIRED_VARS BRLCAD_LEVEL2)
if(BRLCAD_TCL_BUILD)
SetTargetFolder(tclsh "Third Party Executables")
SetTargetFolder(tcl "Third Party Libraries")
@@ -753,7 +743,6 @@
#DISTCLEAN("${CMAKE_BINARY_DIR}/lib/TkTreeCtrl2.4")
# OpenNURBS Library
-set(opennurbs_ALIASES ENABLE_OPENNURBS)
set(opennurbs_DESCRIPTION "
Option for enabling and disabling compilation of the openNURBS library
provided with BRL-CAD's source code. Default is AUTO, responsive to
@@ -761,7 +750,7 @@
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
THIRD_PARTY(openNURBS OPENNURBS openNURBS opennurbs_DESCRIPTION ALIASES
- ${opennurbs_ALIASES} FLAGS NOSYS)
+ ENABLE_OPENNURBS FLAGS NOSYS)
SetTargetFolder(openNURBS "Third Party Libraries")
SetTargetFolder(openNURBS-static "Third Party Libraries")
SetTargetFolder(openNURBS-obj "Third Party Libraries")
@@ -773,7 +762,6 @@
endif(BRLCAD_OPENNURBS_BUILD)
# Screened Poisson Reconstruction Library
-set(poissonrecon_ALIASES ENABLE_SPR)
set(poissonrecon_DESCRIPTION "
Option for enabling and disabling compilation of the PoissonRecon library
provided with BRL-CAD's source code. Default is AUTO, responsive to
@@ -781,7 +769,7 @@
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
THIRD_PARTY(PoissonRecon SPR PoissonRecon poissonrecon_DESCRIPTION ALIASES
- ${poissonrecon_ALIASES} REQUIRED_VARS "BRLCAD_ENABLE_SPR" FLAGS NOSYS)
+ ENABLE_SPR REQUIRED_VARS "BRLCAD_ENABLE_SPR" FLAGS NOSYS)
if(BRLCAD_SPR_BUILD)
SetTargetFolder(PoissonRecon "Third Party Executables")
SetTargetFolder(SurfaceTrimmer "Third Party Executables")
@@ -792,7 +780,6 @@
if(BRLCAD_ENABLE_BINARY_ATTRIBUTES)
#=== LIBBSON ==================================================
# Libbson needed for binary attributes, always use this local version
-set(libbson_ALIASES ENABLE_BSON)
set(libbson_DESCRIPTION "
Option for enabling and disabling compilation of the Libbson library
provided with BRL-CAD's source code. Default is BUNDLED, using
@@ -799,7 +786,7 @@
the included other/src version.
")
THIRD_PARTY(libbson BSON Libbson libbson_DESCRIPTION ALIASES
- ${libbson_ALIASES} FLAGS NOSYS UNDOCUMENTED)
+ ENABLE_BSON FLAGS NOSYS UNDOCUMENTED)
if(BRLCAD_BSON_BUILD)
SetTargetFolder(libBSON "Third Party Libraries")
SetTargetFolder(libBSON-static "Third Party Libraries")
@@ -879,7 +866,6 @@
SetTargetFolder(version_string "Compilation Utilities")
if(BRLCAD_ENABLE_GECODE)
- set(gecode_ALIASES ENABLE_GECODE)
set(gecode_DESCRIPTION "
Option for enabling and disabling compilation of the Gecode Constraint
Solving Libraries provided with BRL-CAD's source code. Default is AUTO,
@@ -888,7 +874,7 @@
")
set(GECODE_USE_QT OFF)
mark_as_advanced(GECODE_USE_QT)
- THIRD_PARTY(gecode GECODE gecode gecode_DESCRIPTION REQUIRED_VARS
BRLCAD_LEVEL3 ALIASES ${gecode_ALIASES})
+ THIRD_PARTY(gecode GECODE gecode gecode_DESCRIPTION REQUIRED_VARS
BRLCAD_LEVEL3 ALIASES ENABLE_GECODE)
if(BRLCAD_GECODE_BUILD)
set(GECODE_LIBRARIES gecodesupport gecodekernel gecodesearch gecodeint
gecodeset gecodefloat gecodeminimodel gecodedriver gecodeflatzinc)
@@ -916,7 +902,6 @@
# systems would have 0.9 of vdslib installed, but it's unmaintained
# and we're likely to be making changes. If our own copy of VDSlib
# ever spins back off into its own project, revisit the NOSYS
-set(libvds_ALIASES ENABLE_VDS)
set(libvds_DESCRIPTION "
Option for enabling and disabling compilation of the libvds triangle
simplification library provided with BRL-CAD's source code. Default
@@ -924,7 +909,7 @@
testing first for a system version if BRLCAD_BUNDLED_LIBS is also
AUTO.
")
-THIRD_PARTY(libvds VDS libvds libvds_DESCRIPTION ALIASES ${libvds_ALIASES}
FLAGS NOSYS)
+THIRD_PARTY(libvds VDS libvds libvds_DESCRIPTION ALIASES ENABLE_VDS FLAGS
NOSYS)
set(LIBVDS_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/libvds" CACHE STRING
"Directory containing libvds headers." FORCE)
mark_as_advanced(LIBVDS_INCLUDE_DIR)
SetTargetFolder(libvds "Third Party Libraries")
@@ -934,7 +919,6 @@
# OpenSceneGraph Libraries
-set(openscenegraph_ALIASES ENABLE_OPENSCENEGRAPH)
set(openscenegraph_DESCRIPTION "
Option for enabling and disabling compilation of the OpenSceneGraph
libraries provided with BRL-CAD's source code. Default is AUTO, responsive to
@@ -942,7 +926,7 @@
version if BRLCAD_BUNDLED_LIBS is also AUTO.
")
THIRD_PARTY(openscenegraph OSG osg openscenegraph_DESCRIPTION
- ALIASES ${openscenegraph_ALIASES} REQUIRED_VARS
"BRLCAD_ENABLE_OSG;BRLCAD_LEVEL3" FIND_NAME OpenSceneGraph FIND_COMPONENTS
+ ALIASES ENABLE_OPENSCENEGRAPH REQUIRED_VARS
"BRLCAD_ENABLE_OSG;BRLCAD_LEVEL3" FIND_NAME OpenSceneGraph FIND_COMPONENTS
osgText osgViewer FLAGS NOSYS)
if(BRLCAD_OSG_BUILD)
set(OSG_LIBRARY osg CACHE STRING "libosg" FORCE)
@@ -981,7 +965,6 @@
endif(BRLCAD_OSG_BUILD)
# gdiam
-set(libgdiam_ALIASES ENABLE_GDIAM)
set(libgdiam_DESCRIPTION "
Option for enabling and disabling compilation of the libgdiam approximate
tight bounding box library provided with BRL-CAD's source code. Default
@@ -989,8 +972,7 @@
testing first for a system version if BRLCAD_BUNDLED_LIBS is also
AUTO.
")
-THIRD_PARTY(libgdiam GDIAM libgdiam libgdiam_DESCRIPTION ALIASES
${libgdiam_ALIASES}
- FLAGS NOSYS)
+THIRD_PARTY(libgdiam GDIAM libgdiam libgdiam_DESCRIPTION ALIASES ENABLE_GDIAM
FLAGS NOSYS)
set(LIBGDIAM_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/libgdiam" CACHE
STRING "Directory containing libgdiam headers." FORCE)
mark_as_advanced(LIBGDIAM_INCLUDE_DIR)
SetTargetFolder(libgdiam "Third Party Libraries")
@@ -997,7 +979,6 @@
SetTargetFolder(libgdiam-static "Third Party Libraries")
# Bullet - Real-Time Physics Simulation libraries
-set(Bullet_ALIASES ENABLE_BULLET)
set(Bullet_DESCRIPTION "
Option for enabling and disabling compilation of the Bullet Realtime
Physics Simulation Libraries provided with BRL-CAD's source
@@ -1005,7 +986,7 @@
BRLCAD_BUNDLED_LIBS option and testing first for a system version
if BRLCAD_BUNDLED_LIBS is also AUTO.
")
-THIRD_PARTY(bullet BULLET bullet Bullet_DESCRIPTION FIND_NAME Bullet
REQUIRED_VARS BRLCAD_ENABLE_BULLET BRLCAD_LEVEL2 ALIASES ${Bullet_ALIASES})
+THIRD_PARTY(bullet BULLET bullet Bullet_DESCRIPTION FIND_NAME Bullet
REQUIRED_VARS BRLCAD_ENABLE_BULLET BRLCAD_LEVEL2 ALIASES ENABLE_BULLET)
if(BRLCAD_BULLET_BUILD)
set(BULLET_INCLUDE_DIR "${BRLCAD_SOURCE_DIR}/src/other/bullet/src" CACHE
STRING "Directory containing bullet headers." FORCE)
set(BULLET_LIBRARIES "bullet" CACHE STRING "BRL-CAD bullet lib." FORCE)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
