Revision: 77584
          http://sourceforge.net/p/brlcad/code/77584
Author:   starseeker
Date:     2020-10-23 02:51:04 +0000 (Fri, 23 Oct 2020)
Log Message:
-----------
Add third party modules

Added Paths:
-----------
    brlcad/branches/extbuild/src/other/ext/CMake/ThirdParty.cmake
    brlcad/branches/extbuild/src/other/ext/CMake/ThirdPartyExecutable.cmake

Added: brlcad/branches/extbuild/src/other/ext/CMake/ThirdParty.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/ThirdParty.cmake               
                (rev 0)
+++ brlcad/branches/extbuild/src/other/ext/CMake/ThirdParty.cmake       
2020-10-23 02:51:04 UTC (rev 77584)
@@ -0,0 +1,292 @@
+#                T H I R D P A R T Y . C M A K E
+# BRL-CAD
+#
+# Copyright (c) 2011-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+function(VAL_NORMALIZE val optype)
+  string(TOUPPER "${${val}}" uval)
+  if("${uval}" STREQUAL "YES")
+    set(uval "ON")
+  endif("${uval}" STREQUAL "YES")
+  if("${uval}" STREQUAL "NO")
+    set(uval "OFF")
+  endif("${uval}" STREQUAL "NO")
+  if("${optype}" STREQUAL "ABS")
+    if("${uval}" STREQUAL "ON")
+      set(uval "BUNDLED")
+    endif("${uval}" STREQUAL "ON")
+    if("${uval}" STREQUAL "OFF")
+      set(uval "SYSTEM")
+    endif("${uval}" STREQUAL "OFF")
+  endif("${optype}" STREQUAL "ABS")
+  set(${val} "${uval}" PARENT_SCOPE)
+endfunction(VAL_NORMALIZE)
+
+# Synopsis:
+#
+# THIRD_PARTY(dir
+#             vroot
+#             build_target
+#             description
+#             [FIND_NAME name]
+#             [FIND_VERSION version]
+#             [FIND_COMPONENTS component1 component2 ...]
+#             [REQUIRED_VARS var1 var2 ...]
+#             [RESET_VARS var1 var2 ...]
+#             [ALIASES alias1 alias2 ...]
+#             [FLAGS flag1 flag2 ...]
+#             [UNDOCUMENTED]
+#            )
+
+#-----------------------------------------------------------------------------
+function(THIRD_PARTY dir vroot build_target description)
+
+  # Parse extra arguments
+  cmake_parse_arguments(TP "UNDOCUMENTED;NOSYS" "FIND_NAME;FIND_VERSION" 
"FIND_COMPONENTS;REQUIRED_VARS;RESET_VARS;ALIASES;FLAGS" ${ARGN})
+
+  # If the library variable has been explicitly set, get
+  # a normalized version of it for easier matching
+  set(local_opt)
+  if(NOT "${BRLCAD_${vroot}}" STREQUAL "")
+    set(local_opt "${BRLCAD_${vroot}}")
+  endif(NOT "${BRLCAD_${vroot}}" STREQUAL "")
+  VAL_NORMALIZE(local_opt ABS)
+
+  # Initialize some variables
+  set(TP_DISABLED 0)
+  set(TP_DISABLE_TEST 0)
+  set(TP_MET_CONDITION 0)
+  if(NOT TP_FIND_NAME)
+    set(TP_FIND_NAME ${vroot})
+  endif(NOT TP_FIND_NAME)
+
+  # 0. Whether or not we're building the sources, we are tracking the files
+  # that are supposed to be in the directory
+  get_filename_component(DIR_NAME "${dir}" NAME)
+  #if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
+  #  message(FATAL_ERROR "Third party component ${DIR_NAME} does not have a 
dist file at \"${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist\"")
+  #endif(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
+  #include("${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
+  #CMAKEFILES_IN_DIR(${DIR_NAME}_ignore_files ${dir})
+
+  # 1. If any of the required flags are off, this extension is a no-go.
+  set(DISABLE_STR "")
+  foreach(item ${TP_REQUIRED_VARS})
+    if(NOT ${item})
+      set(TP_DISABLED 1)
+      set(TP_DISABLE_TEST 1)
+      set(BRLCAD_${vroot}_BUILD OFF)
+      if(NOT DISABLE_STR)
+       set(DISABLE_STR "${item}")
+      else(NOT DISABLE_STR)
+       set(DISABLE_STR "${DISABLE_STR},${item}")
+      endif(NOT DISABLE_STR)
+    endif(NOT ${item})
+  endforeach(item ${TP_REQUIRED_VARS})
+  if(DISABLE_STR)
+    set(BRLCAD_${vroot} "DISABLED ${DISABLE_STR}" CACHE STRING "DISABLED 
${DISABLED_STR}" FORCE)
+    mark_as_advanced(FORCE BRLCAD_${vroot})
+    set_property(CACHE BRLCAD_${vroot} PROPERTY STRINGS "DISABLED 
${DISABLE_STR}")
+    set(TP_MET_CONDITION 1)
+  else(DISABLE_STR)
+    # If we have a leftover disabled setting in the cache from earlier runs, 
clear it.
+    if("${local_opt}" MATCHES "DISABLED")
+      set(BRLCAD_${vroot} "" CACHE STRING "Clear DISABLED setting" FORCE)
+      mark_as_advanced(CLEAR BRLCAD_${vroot})
+    endif("${local_opt}" MATCHES "DISABLED")
+  endif(DISABLE_STR)
+
+  # 2. Next - is the library variable explicitly set to SYSTEM?  If it is, we 
are NOT building it.
+  if(local_opt)
+    if("${local_opt}" STREQUAL "SYSTEM")
+      set(BRLCAD_${vroot}_BUILD OFF)
+      set(BRLCAD_${vroot} "SYSTEM" CACHE STRING "User forced to SYSTEM" FORCE)
+      set(TP_MET_CONDITION 2)
+      if(TP_NOSYS)
+         message(WARNING "Compilation of ${build_target} was disabled, but 
local copy is modified - using a system version of ${build_target} may 
introduce problems or even fail to work!")
+      endif(TP_NOSYS)
+    endif("${local_opt}" STREQUAL "SYSTEM")
+  endif(local_opt)
+
+  # 3. If we have a NOSYS flag and aren't explicitly disabled, ALWAYS use the 
bundled version.
+  # The NOSYS flag signifies that the BRL-CAD project requires modifications 
in the local src/other
+  # version of a library or tool that are not likely to be present in a system 
version.  These flags
+  # should be periodically reviewed to determine if they can be removed (i.e. 
system packages have
+  # appeared in modern OS distributions with the fixes needed by BRL-CAD...)
+  if(NOT TP_MET_CONDITION AND TP_NOSYS)
+    set(BRLCAD_${vroot} "BUNDLED" CACHE STRING "NOSYS passed, using bundled 
${build_target}" FORCE)
+    mark_as_advanced(BRLCAD_${vroot})
+    set(BRLCAD_${vroot}_BUILD ON)
+    set(TP_MET_CONDITION 3)
+    set(TP_DISABLE_TEST 1)
+  endif(NOT TP_MET_CONDITION AND TP_NOSYS)
+
+  # 4. If we have an explicit BUNDLE request for this particular library,  
honor it as long as
+  # features are satisfied.  No point in testing if we know we're turning it 
on - set vars accordingly.
+  if(local_opt)
+    if("${local_opt}" STREQUAL "BUNDLED")
+      if(NOT TP_MET_CONDITION)
+       set(BRLCAD_${vroot}_BUILD ON)
+       set(BRLCAD_${vroot} "BUNDLED" CACHE STRING "User forced to BUNDLED" 
FORCE)
+       set(TP_DISABLE_TEST 1)
+       set(TP_MET_CONDITION 4)
+      endif(NOT TP_MET_CONDITION)
+    endif("${local_opt}" STREQUAL "BUNDLED")
+  endif(local_opt)
+
+  # 5. If BRLCAD_BUNDLED_LIBS is exactly SYSTEM or exactly BUNDLED, and we 
haven't been overridden by
+  # one of the other conditions above, go with that.
+  if(NOT TP_MET_CONDITION)
+    if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" 
STREQUAL "BUNDLED")
+      set(BRLCAD_${vroot} "${BRLCAD_BUNDLED_LIBS} (AUTO)" CACHE
+               STRING "BRLCAD_BUNDLED_LIBS: ${BRLCAD_BUNDLED_LIBS}" FORCE)
+      if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+       set(BRLCAD_${vroot}_BUILD OFF)
+       set(TP_MET_CONDITION 5)
+      elseif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
+       set(BRLCAD_${vroot}_BUILD ON)
+       set(TP_DISABLE_TEST 1)
+       set(TP_MET_CONDITION 5)
+      endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+    endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR 
"${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
+  endif(NOT TP_MET_CONDITION)
+
+  # If we haven't been knocked out by any of the above conditions, do our 
testing and base the results on that.
+
+  if(NOT TP_DISABLE_TEST)
+    # Stash the previous results (if any) so we don't repeatedly call out the 
tests - only report
+    # if something actually changes in subsequent runs.
+    set(${vroot}_FOUND_STATUS ${${vroot}_FOUND})
+
+    # Initialize (or rather, uninitialize) variables in preparation for search
+    unset(${vroot}_FOUND CACHE)
+    mark_as_advanced(${vroot}_FOUND)
+    foreach(item ${TP_RESET_VARS})
+      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)
+    endif("${${vroot}_FOUND_STATUS}" MATCHES "NOTFOUND")
+
+    # Find the package in question.  It is the toplevel CMakeLists.txt's 
responsibility to make
+    # sure that the CMAKE_MODULE_PATH variable is set correctly if there are 
local versions of
+    # Find*.cmake scripts that should be used.  Note that newer CMake versions 
will prefer a system
+    # version of the module, so if a custom override is needed the Find*.cmake 
name should not conflict
+    # with the system version.
+    find_package(${TP_FIND_NAME} ${TP_FIND_VERSION} COMPONENTS 
${TP_FIND_COMPONENTS})
+
+    # going to use system or bundled versions of deps
+    if(${vroot}_FOUND)
+      set(BRLCAD_${vroot}_BUILD OFF)
+      if(NOT "BRLCAD_${vroot}" STREQUAL "SYSTEM")
+       set(BRLCAD_${vroot} "SYSTEM (AUTO)" CACHE STRING "Found System version, 
using" FORCE)
+      endif(NOT "BRLCAD_${vroot}" STREQUAL "SYSTEM")
+    else(${vroot}_FOUND)
+      # If one of our previous conditions precludes building this library, 
we've got a problem.
+      if("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" STREQUAL 
SYSTEM)
+       set(BRLCAD_${vroot}_BUILD OFF)
+       set(BRLCAD_${vroot}_NOTFOUND 1)
+       message(WARNING "Compilation of local version of ${build_target} was 
disabled, but system version not found!")
+       if(NOT "${local_opt}" STREQUAL "SYSTEM")
+         set(BRLCAD_${vroot} "SYSTEM (AUTO)" CACHE STRING "BRLCAD_BUNDLED_LIBS 
forced to SYSTEM, but library not found!" FORCE)
+       else(NOT "${local_opt}" STREQUAL "SYSTEM")
+         set(BRLCAD_${vroot} "SYSTEM" CACHE STRING "Hard-set to SYSTEM by 
user, but library not found!" FORCE)
+       endif(NOT "${local_opt}" STREQUAL "SYSTEM")
+      else("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" 
STREQUAL SYSTEM)
+       set(BRLCAD_${vroot}_BUILD ON)
+       set(BRLCAD_${vroot} "BUNDLED (AUTO)" CACHE STRING "System test failed, 
enabling local copy" FORCE)
+      endif("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" 
STREQUAL SYSTEM)
+    endif(${vroot}_FOUND)
+  endif(NOT TP_DISABLE_TEST)
+
+  # If we're going with a system version of a library, we have to remove any 
previously built
+  # output from enabled bundled copies of the library in question, or the 
linker will get
+  # confused - a system lib was found and system libraries are to be preferred 
with current
+  # options.  This is unfortunate in that it may introduce extra build work 
just from trying
+  # configure options, but appears to be essential to ensuring that the build 
"just works"
+  # each time.
+  if (NOT BRLCAD_${vroot}_BUILD)
+
+    if (EXISTS "${CMAKE_BUILD_DIR}/${build_target}_files.txt")
+
+      file(STRINGS "${CMAKE_BUILD_DIR}/${build_target}_files.txt" STALE_FILES)
+
+      foreach(stale_file ${STALE_FILES})
+       execute_process(
+         COMMAND ${CMAKE_COMMAND} -E remove ${stale_file}
+         OUTPUT_VARIABLE rm_out
+         RETURN_VALUE rm_retval
+         )
+      endforeach(stale_file ${STALE_FILES})
+
+    endif (EXISTS "${CMAKE_BUILD_DIR}/${build_target}_files.txt")
+
+    if(NOT "BRLCAD_${vroot}" MATCHES "${local_opt}")
+      if("${local_opt}" MATCHES "BUNDLED")
+       message("Reconfiguring to use system ${vroot}")
+      endif("${local_opt}" MATCHES "BUNDLED")
+    endif(NOT "BRLCAD_${vroot}" MATCHES "${local_opt}")
+
+  endif(NOT BRLCAD_${vroot}_BUILD)
+
+  # After all that, we know now what to do about this particular dependency
+  set(BRLCAD_${vroot}_BUILD "${BRLCAD_${vroot}_BUILD}" PARENT_SCOPE)
+
+
+  # If this is a BRL-CAD build, update the options
+  if (COMMAND BRLCAD_OPTION)
+    if(NOT ${vroot}_UNDOCUMENTED)
+      BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${vroot}" 
"${${CMAKE_PROJECT_NAME}_${vroot}}"
+       TYPE ABS
+       ALIASES ${TP_ALIASES}
+       DESCRIPTION "${description}")
+    endif(NOT ${vroot}_UNDOCUMENTED)
+  endif (COMMAND BRLCAD_OPTION)
+
+  # For drop-down menus in CMake gui - set STRINGS property
+  set_property(CACHE BRLCAD_${vroot} PROPERTY STRINGS AUTO BUNDLED SYSTEM)
+
+  mark_as_advanced(${vroot}_LIBRARY)
+  mark_as_advanced(${vroot}_INCLUDE_DIR)
+endfunction(THIRD_PARTY)
+
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8


Property changes on: 
brlcad/branches/extbuild/src/other/ext/CMake/ThirdParty.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: brlcad/branches/extbuild/src/other/ext/CMake/ThirdPartyExecutable.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/CMake/ThirdPartyExecutable.cmake     
                        (rev 0)
+++ brlcad/branches/extbuild/src/other/ext/CMake/ThirdPartyExecutable.cmake     
2020-10-23 02:51:04 UTC (rev 77584)
@@ -0,0 +1,326 @@
+#      T H I R D P A R T Y E X E C U T A B L E . C M A K E
+# BRL-CAD
+#
+# Copyright (c) 2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+#-----------------------------------------------------------------------------
+# We need a way to tell whether one path is a subpath of another path without
+# relying on regular expressions, since file paths may have characters in them
+# that will trigger regex matching behavior when we don't want it.  (To test,
+# for example, use a build directory name of build++)
+#
+# Sets ${result_var} to 1 if the candidate subpath is actually a subpath of
+# the supplied "full" path, otherwise sets it to 0.
+#
+# The routine below does the check without using regex matching, in order to
+# handle path names that contain characters that would be interpreted as active
+# in a regex string.
+function(IS_SUBPATH candidate_subpath full_path result_var)
+
+  # Just assume it isn't until we prove it is
+  set(${result_var} 0 PARENT_SCOPE)
+
+  # get the CMake form of the path so we have something consistent to work on
+  file(TO_CMAKE_PATH "${full_path}" c_full_path)
+  file(TO_CMAKE_PATH "${candidate_subpath}" c_candidate_subpath)
+
+  # check the string lengths - if the "subpath" is longer than the full path,
+  # there's not point in going further
+  string(LENGTH "${c_full_path}" FULL_LENGTH)
+  string(LENGTH "${c_candidate_subpath}" SUB_LENGTH)
+  if("${SUB_LENGTH}" GREATER "${FULL_LENGTH}")
+    return()
+  endif("${SUB_LENGTH}" GREATER "${FULL_LENGTH}")
+
+  # OK, maybe it's a subpath - time to actually check
+  string(SUBSTRING "${c_full_path}" 0 ${SUB_LENGTH} c_full_subpath)
+  if(NOT "${c_full_subpath}" STREQUAL "${c_candidate_subpath}")
+    return()
+  endif(NOT "${c_full_subpath}" STREQUAL "${c_candidate_subpath}")
+
+  # If we get here, it's a subpath
+  set(${result_var} 1 PARENT_SCOPE)
+
+endfunction(IS_SUBPATH)
+
+function(THIRD_PARTY_EXECUTABLE dir varname_root build_target)
+
+  # Parse extra arguments
+  CMAKE_PARSE_ARGUMENTS(TP "NOSYS" "" "REQUIRED_VARS;ALIASES;DESCRIPTION" 
${ARGN})
+
+  # If the exec variable has been explicitly set, get
+  # an normalized version of it for easier matching
+  set(local_opt)
+  if(NOT ${BRLCAD_${varname_root}} STREQUAL "")
+    set(local_opt "${BRLCAD_${varname_root}}")
+  endif(NOT ${BRLCAD_${varname_root}} STREQUAL "")
+  VAL_NORMALIZE(local_opt ABS)
+
+  # Initialize some variables
+  set(TP_DISABLED 0)
+  set(TP_DISABLE_TEST 0)
+  set(TP_MET_CONDITION 0)
+
+  # 0.  Whether or not we're building the sources, we are tracking the files
+  # that are supposed to be in the directory
+  get_filename_component(DIR_NAME "${dir}" NAME)
+  #if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
+  #  message(FATAL_ERROR "Third party component ${DIR_NAME} does not have a 
dist file at \"${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist\"")
+  #endif(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
+  #include("${CMAKE_CURRENT_SOURCE_DIR}/${DIR_NAME}.dist")
+  #CMAKEFILES_IN_DIR(${DIR_NAME}_ignore_files ${dir})
+
+  # 1.  For executables, it is a reasonable use case that the developer 
manually specifies
+  # the location for an executable.  It is tricky to distinguish this 
situation from
+  # a previously cached executable path resulting from a Find*.cmake script.  
The way
+  # we will proceed is to cache the value of ${varname_root}_EXECUTABLE if it 
is defined, and
+  # at the end check it against the results of running the THIRD_PARTY logic.  
If
+  # it matches neither pattern (Bundled or System) it is assumed that the 
value passed
+  # in is an intentional setting on the part of the developer.  This has one 
potential
+  # drawback in that the *removal* of a system executable between searches 
could result
+  # in a previously cached system search result being identified as a 
user-specified
+  # result - to prevent that, the cached path is only used to override other 
results
+  # if the file it specifies actually exists.  One additional wrinkle here - 
if the
+  # developer has hard-specified BUNDLED for this particular executable, even 
a user specified
+  # or cached value will be replaced with the local path.  A feature based 
disablement
+  # of the tool also applies to the cached version.
+  if(${varname_root}_EXECUTABLE)
+    IS_SUBPATH("${CMAKE_BINARY_DIR}" "${${varname_root}_EXECUTABLE}" 
SUBBUILD_TEST)
+    if("${SUBBUILD_TEST}" STREQUAL "0")
+      get_filename_component(FULL_PATH_EXEC ${${varname_root}_EXECUTABLE} 
ABSOLUTE)
+      if("${FULL_PATH_EXEC}" STREQUAL "${${varname_root}_EXECUTABLE}")
+       if(EXISTS ${FULL_PATH_EXEC})
+         set(EXEC_CACHED ${${varname_root}_EXECUTABLE})
+       else(EXISTS ${FULL_PATH_EXEC})
+         # This path not being present may indicate the user specified a path
+         # and made a mistake doing so - warn that this might be the case.
+         message(WARNING "File path ${${varname_root}_EXECUTABLE} specified 
for ${varname_root}_EXECUTABLE does not exist - this path will not override 
${build_target} executable search results.")
+       endif(EXISTS ${FULL_PATH_EXEC})
+      endif("${FULL_PATH_EXEC}" STREQUAL "${${varname_root}_EXECUTABLE}")
+    endif("${SUBBUILD_TEST}" STREQUAL "0")
+  endif(${varname_root}_EXECUTABLE)
+
+  # 2. If any of the required flags are off, this tool is a no-go.
+  set(DISABLE_STR "")
+  foreach(item ${TP_REQUIRED_VARS})
+    if(NOT ${item})
+      set(TP_DISABLED 1)
+      set(TP_DISABLE_TEST 1)
+      set(BRLCAD_${varname_root}_BUILD OFF)
+      if(NOT DISABLE_STR)
+       set(DISABLE_STR "${item}")
+      else(NOT DISABLE_STR)
+       set(DISABLE_STR "${DISABLE_STR},${item}")
+      endif(NOT DISABLE_STR)
+    endif(NOT ${item})
+  endforeach(item ${TP_REQUIRED_VARS})
+  if(DISABLE_STR)
+    set(BRLCAD_${varname_root} "DISABLED ${DISABLE_STR}" CACHE STRING 
"DISABLED ${DISABLED_STR}" FORCE)
+    mark_as_advanced(FORCE BRLCAD_${varname_root})
+    set(${varname_root}_MET_CONDITION 1)
+    set(BRLCAD_${varname_root}_BUILD OFF)
+  else(DISABLE_STR)
+    # If we have a leftover disabled setting in the cache from earlier runs, 
clear it.
+    if("${local_opt}" MATCHES "DISABLED")
+      set(BRLCAD_${varname_root} "" CACHE STRING "Clear DISABLED setting" 
FORCE)
+      mark_as_advanced(CLEAR BRLCAD_${varname_root})
+    endif("${local_opt}" MATCHES "DISABLED")
+  endif(DISABLE_STR)
+
+  # 3. Next - is the executable variable explicitly set to SYSTEM?  If it is, 
we are NOT building it.
+  if(local_opt)
+    if("${local_opt}" STREQUAL "SYSTEM")
+      set(BRLCAD_${varname_root}_BUILD OFF)
+      set(TP_MET_CONDITION 2)
+      if(TP_NOSYS)
+       message(WARNING "Compilation of ${build_target} was disabled, but local 
copy is modified - using a system version of ${build_target} may introduce 
problems or even fail to work!")
+      endif(TP_NOSYS)
+    endif("${local_opt}" STREQUAL "SYSTEM")
+  endif(local_opt)
+
+  # 4. If we have a NOSYS flag, ALWAYS* use the bundled version.  The NOSYS 
flag signifies that
+  # the BRL-CAD project requires modifications in the local src/other version 
of a library or
+  # tool that are not likely to be present in a system version.  These flags 
should be periodically
+  # reviewed to determine if they can be removed (i.e. system packages have 
appeared in modern
+  # OS distributions with the fixes needed by BRL-CAD...).
+  #
+  # * In the case of executables, we'll allow a cached value from the user to 
override the NOSYS
+  # flag, since that's a likely scenario for testing, but that shouldn't be 
done except for testing
+  # purposes with a NOSYS target.
+  if(NOT TP_MET_CONDITION AND TP_NOSYS)
+    set(BRLCAD_${varname_root} "BUNDLED" CACHE STRING "NOSYS passed, using 
bundled ${build_target}" FORCE)
+    mark_as_advanced(BRLCAD_${varname_root})
+    set(BRLCAD_${varname_root}_BUILD ON)
+    set(TP_MET_CONDITION 3)
+    set(TP_DISABLE_TEST 1)
+  endif(NOT TP_MET_CONDITION AND TP_NOSYS)
+
+  # 5. If we have an explicit BUNDLE request for this particular executable,  
honor it as long as
+  # features are satisfied.  No point in testing if we know we're turning it 
on - set vars accordingly.
+  if(NOT TP_MET_CONDITION AND "${local_opt}" STREQUAL "BUNDLED")
+    set(BRLCAD_${varname_root}_BUILD ON)
+    set(TP_DISABLE_TEST 1)
+    set(TP_MET_CONDITION 4)
+  endif(NOT TP_MET_CONDITION AND "${local_opt}" STREQUAL "BUNDLED")
+
+
+  # 5. If BRLCAD_BUNDLED_LIBS is exactly SYSTEM or exactly BUNDLED, and we 
haven't been overridden by
+  # one of the other conditions above, go with that.
+  if(NOT TP_MET_CONDITION)
+    if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" 
STREQUAL "BUNDLED")
+      set(BRLCAD_${varname_root} "${BRLCAD_BUNDLED_LIBS} (AUTO)" CACHE STRING 
"BRLCAD_BUNDLED_LIBS: ${BRLCAD_BUNDLED_LIBS}" FORCE)
+      if("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+       set(BRLCAD_${varname_root}_BUILD OFF)
+       set(TP_MET_CONDITION 5)
+      elseif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
+       set(BRLCAD_${varname_root}_BUILD ON)
+       set(TP_DISABLE_TEST 1)
+       set(TP_MET_CONDITION 5)
+      endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM")
+    endif("${BRLCAD_BUNDLED_LIBS}" STREQUAL "SYSTEM" OR 
"${BRLCAD_BUNDLED_LIBS}" STREQUAL "BUNDLED")
+  endif(NOT TP_MET_CONDITION)
+
+  # If we haven't been knocked out by any of the above conditions, do our 
testing and base the results on that.
+  if(NOT TP_DISABLE_TEST)
+    # Stash the previous results (if any) so we don't repeatedly call out the 
tests - only report
+    # if something actually changes in subsequent runs.
+    set(${varname_root}_FOUND_STATUS ${${varname_root}_FOUND})
+
+    # Initialize (or rather, uninitialize) variables in preparation for search
+    set(${varname_root}_FOUND "${varname_root}-NOTFOUND" CACHE STRING 
"${varname_root}_FOUND" FORCE)
+    mark_as_advanced(${varname_root}_FOUND)
+    set(${varname_root}_EXECUTABLE "${varname_root}-NOTFOUND" CACHE STRING 
"${varname_root}_EXECUTABLE" FORCE)
+
+    # Be quiet if we're doing this over
+    if("${${varname_root}_FOUND_STATUS}" MATCHES "NOTFOUND")
+      set(${varname_root}_FIND_QUIETLY TRUE)
+    endif("${${varname_root}_FOUND_STATUS}" MATCHES "NOTFOUND")
+
+    # Include the Find module for the executable in question
+    if(EXISTS ${BDEPS_CMAKE_DIR}/Find${varname_root}.cmake)
+      include(${BDEPS_CMAKE_DIR}/Find${varname_root}.cmake)
+    else(EXISTS ${BDEPS_CMAKE_DIR}/Find${varname_root}.cmake)
+      include(${CMAKE_ROOT}/Modules/Find${varname_root}.cmake)
+    endif(EXISTS ${BDEPS_CMAKE_DIR}/Find${varname_root}.cmake)
+
+    # going to use system or bundled versions of deps
+    if(${varname_root}_FOUND)
+      set(BRLCAD_${varname_root}_BUILD OFF)
+      set(BRLCAD_${varname_root} "SYSTEM (AUTO)" CACHE STRING "Found System 
version, using" FORCE)
+    else(${varname_root}_FOUND)
+      # If one of our previous conditions precludes building this library, 
we've got a problem unless the
+      # cached version is suitable - check that before we warn.
+      if(NOT "${local_opt}" STREQUAL "SYSTEM" AND NOT "${BRLCAD_BUNDLED_LIBS}" 
STREQUAL SYSTEM)
+       set(BRLCAD_${varname_root}_BUILD ON)
+       set(BRLCAD_${varname_root} "BUNDLED (AUTO)" CACHE STRING "System test 
failed, enabling local copy" FORCE)
+      endif(NOT "${local_opt}" STREQUAL "SYSTEM" AND NOT 
"${BRLCAD_BUNDLED_LIBS}" STREQUAL SYSTEM)
+    endif(${varname_root}_FOUND)
+
+  endif(NOT TP_DISABLE_TEST)
+
+  # Now that we've run the Find routine, see if we had a cached value 
different from any of our
+  # standard results
+  set(TP_USING_CACHED 0)
+  if(NOT "${TP_MET_CONDITION}" STREQUAL "1" AND NOT "${TP_MET_CONDITION}" 
STREQUAL "4")
+    if(EXEC_CACHED)
+      # Is it a build target?  If so, don't cache it.
+      get_filename_component(EXEC_CACHED_ABS_PATH ${EXEC_CACHED} ABSOLUTE)
+      IF ("${EXEC_CACHED_ABS_PATH}" STREQUAL "${PATH_ABS}")
+       # Is it the bundled path? (don't override if it is, the bundled option 
setting takes care of that)
+       if(NOT "${EXEC_CACHED}" STREQUAL 
"${CMAKE_BINARY_DIR}/${BIN_DIR}/${build_target}")
+         # Is it the same as the found results?
+         if(NOT "${EXEC_CACHED}" STREQUAL 
"${${varname_root}_EXECUTABLE_FOUND_RESULT}")
+           set(${varname_root}_EXECUTABLE ${EXEC_CACHED} CACHE STRING 
"Apparently a user specified path was supplied, use it" FORCE)
+           set(BRLCAD_${varname_root}_BUILD OFF)
+           set(BRLCAD_${varname_root} "SYSTEM (AUTO)" CACHE STRING "Apparently 
a user specified path was supplied, use it" FORCE)
+           set(TP_USING_CACHED 1)
+         endif(NOT "${EXEC_CACHED}" STREQUAL 
"${${varname_root}_EXECUTABLE_FOUND_RESULT}")
+       endif(NOT "${EXEC_CACHED}" STREQUAL 
"${CMAKE_BINARY_DIR}/${BIN_DIR}/${build_target}")
+      endif("${EXEC_CACHED_ABS_PATH}" STREQUAL "${PATH_ABS}")
+    endif(EXEC_CACHED)
+  endif(NOT "${TP_MET_CONDITION}" STREQUAL "1" AND NOT "${TP_MET_CONDITION}" 
STREQUAL "4")
+
+  # If the CACHED value doesn't look good, and we aren't overridden by any of 
the other conditions, set based
+  # on the test results
+  if(NOT TP_USING_CACHED AND NOT TP_DISABLE_TEST)
+    if(${varname_root}_FOUND)
+      set(BRLCAD_${varname_root}_BUILD OFF)
+      if(NOT "BRLCAD_${varname_root}" STREQUAL "SYSTEM")
+       set(BRLCAD_${varname_root} "SYSTEM (AUTO)" CACHE STRING "Found System 
version, using" FORCE)
+      endif(NOT "BRLCAD_${varname_root}" STREQUAL "SYSTEM")
+    else(${varname_root}_FOUND)
+      # If one of our previous conditions precludes building this exec, we've 
got a problem.
+      if("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" STREQUAL 
SYSTEM)
+       set(BRLCAD_${varname_root}_BUILD ON)
+       set(BRLCAD_${varname_root}_NOTFOUND 1)
+       message(WARNING "Compilation of local version of ${build_target} was 
disabled, but system version not found!")
+       if(NOT "${local_opt}" STREQUAL "SYSTEM")
+         set(BRLCAD_${varname_root} "SYSTEM (AUTO)" CACHE STRING 
"BRLCAD_BUNDLED_LIBS forced to SYSTEM, but library not found!" FORCE)
+       else(NOT "${local_opt}" STREQUAL "SYSTEM")
+         set(BRLCAD_${varname_root} "SYSTEM" CACHE STRING "Hard-set to SYSTEM 
by user, but library not found!" FORCE)
+       endif(NOT "${local_opt}" STREQUAL "SYSTEM")
+      else("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" 
STREQUAL SYSTEM)
+       set(BRLCAD_${varname_root}_BUILD ON)
+       set(BRLCAD_${varname_root} "BUNDLED (AUTO)" CACHE STRING "System test 
failed, enabling local copy" FORCE)
+      endif("${local_opt}" STREQUAL "SYSTEM" OR "${BRLCAD_BUNDLED_LIBS}" 
STREQUAL SYSTEM)
+    endif(${varname_root}_FOUND)
+  endif(NOT TP_USING_CACHED AND NOT TP_DISABLE_TEST)
+
+  mark_as_advanced(${varname_root}_EXECUTABLE)
+  mark_as_advanced(${varname_root}_EXECUTABLE_TARGET)
+  mark_as_advanced(${varname_root}_FOUND)
+
+
+  # If this is a BRL-CAD build, update the options
+  if (COMMAND BRLCAD_OPTION)
+    if(TP_ALIASES AND TP_DESCRIPTION)
+      BRLCAD_OPTION("${CMAKE_PROJECT_NAME}_${vroot}" 
"${${CMAKE_PROJECT_NAME}_${vroot}}"
+       TYPE ABS
+       ALIASES ${TP_ALIASES}
+       DESCRIPTION "${TP_DESCRIPTION}")
+    endif(TP_ALIASES AND TP_DESCRIPTION)
+  endif (COMMAND BRLCAD_OPTION)
+
+
+  # Tell the calling scope what the final result was
+  set(BRLCAD_${varname_root}_BUILD ${BRLCAD_${varname_root}_BUILD} 
PARENT_SCOPE)
+
+endfunction(THIRD_PARTY_EXECUTABLE)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8


Property changes on: 
brlcad/branches/extbuild/src/other/ext/CMake/ThirdPartyExecutable.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
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

Reply via email to