Revision: 77278
http://sourceforge.net/p/brlcad/code/77278
Author: starseeker
Date: 2020-09-29 21:13:18 +0000 (Tue, 29 Sep 2020)
Log Message:
-----------
Start unwiring old src/other setup.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/CMakeLists.txt
brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindNETPBM.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindOPENNURBS.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindPOLY2TRI.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake
brlcad/branches/thirdparty_rework/src/adrt/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/adrt/master/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libbrep/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libdm/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libicv/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/libgdiam/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/libnetpbm/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/libspsr/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/poly2tri/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/rt/do.c
brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
brlcad/branches/thirdparty_rework/src/util/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-09-29 18:55:20 UTC
(rev 77277)
+++ brlcad/branches/thirdparty_rework/CMakeLists.txt 2020-09-29 21:13:18 UTC
(rev 77278)
@@ -2058,12 +2058,6 @@
endif(MSVC)
#-----------------------------------------------------------------------------
-# Before we head into src/other and misc/tools, store all the build
-# flags that have been built up. It's hard to be sure what will and
-# won't be set in those directories, so make sure we can restore the
-# BRL-CAD flags for the actual BRL-CAD subdirectories.
-CACHE_BUILD_FLAGS(_BRLCAD)
-
# For lower build levels, some of the third party components are not
# needed. define some variables we can use for testing.
set(BRLCAD_LEVEL2 0)
@@ -2080,11 +2074,6 @@
endif(${BRLCAD_ENABLE_TARGETS} GREATER 2)
endif(NOT BRLCAD_ENABLE_TARGETS)
-# At the start, clear the src/other subdirs list so repeated
-# configures will correctly add the required directories
-set(SRC_OTHER_ADDED_DIRS "" CACHE STRING "initialize 3rd party sub-directories
list" FORCE)
-mark_as_advanced(SRC_OTHER_ADDED_DIRS)
-
function(SetTargetFolder targetname folder)
if(TARGET ${targetname})
set_target_properties(${targetname} PROPERTIES FOLDER "${folder}")
@@ -2091,9 +2080,6 @@
endif(TARGET ${targetname})
endfunction(SetTargetFolder)
-# Load some CMake macros to handle the special case of third party libraries.
-include(ThirdParty)
-
# Add misc/tools for tools that are used in BRL-CAD's build process
# but are not otherwise usable in BRL-CAD (due to licensing, design
# intent, etc.) misc/tools must be handled before src/other because
@@ -2108,18 +2094,6 @@
# tests so the CACHE reflects BRL-CAD's test results.
add_subdirectory(src/other)
-# Now put back the BRL-CAD flags
-RESTORE_CACHED_BUILD_FLAGS(_BRLCAD)
-
-# Restore BRL-CAD configurations, if necessary
-if(NOT ENABLE_ALL_CONFIG_TYPES)
- if(CMAKE_CONFIGURATION_TYPES AND NOT "${CMAKE_CONFIGURATION_TYPES}" STREQUAL
"Debug;Release")
- set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Allowed
BRL-CAD configuration types" FORCE)
- endif(CMAKE_CONFIGURATION_TYPES AND NOT "${CMAKE_CONFIGURATION_TYPES}"
STREQUAL "Debug;Release")
-endif(NOT ENABLE_ALL_CONFIG_TYPES)
-
-
-
if(BRLCAD_PRINT_MSGS)
message("***********************************************************")
message("* Stage 9 of 9 - Output and Summarize Config *")
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindGDIAM.cmake
2020-09-29 21:13:18 UTC (rev 77278)
@@ -1,60 +1,102 @@
-# F I N D G D I A M . C M A K E
-# BRL-CAD
-#
-# Copyright (c) 2013-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.
-#
-###
-# - Find Approximate Tight Bounding Box library
-#
-# The following variables are set:
-#
-# GDIAM_INCLUDE_DIRS - where to find gdiam.h, etc.
-# GDIAM_LIBRARIES - List of libraries when using gdiam.
-# GDIAM_FOUND - True if gdiam found.
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
-find_path(GDIAM_INCLUDE_DIR gdiam.h)
-find_library(GDIAM_LIBRARY NAMES gdiam)
+#[=======================================================================[.rst:
+FindGDIAM
+--------
+Find the native GDIAM includes and library.
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` target ``GDIAM::GDIAM``, if
+GDIAM has been found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+::
+
+ GDIAM_INCLUDE_DIRS - where to find gdiam.hpp, etc.
+ GDIAM_LIBRARIES - List of libraries when using gdiam.
+ GDIAM_FOUND - True if gdiam found.
+
+Hints
+^^^^^
+
+A user may set ``GDIAM_ROOT`` to a gdiam installation root to tell this
+module where to look.
+#]=======================================================================]
+
+set(_GDIAM_SEARCHES)
+
+# Search GDIAM_ROOT first if it is set.
+if(GDIAM_ROOT)
+ set(_GDIAM_SEARCH_ROOT PATHS ${GDIAM_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _GDIAM_SEARCHES _GDIAM_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_GDIAM_x86 "(x86)")
+set(_GDIAM_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/gdiam"
+ "$ENV{ProgramFiles${_GDIAM_x86}}/gdiam")
+unset(_GDIAM_x86)
+list(APPEND _GDIAM_SEARCHES _GDIAM_SEARCH_NORMAL)
+
+set(GDIAM_NAMES gdiam)
+
+# Try each search configuration.
+foreach(search ${_GDIAM_SEARCHES})
+ find_path(GDIAM_INCLUDE_DIR NAMES gdiam.hpp ${${search}} PATH_SUFFIXES
include include/gdiam gdiam)
+endforeach()
+
+# Allow GDIAM_LIBRARY to be set manually, as the location of the gdiam library
+if(NOT GDIAM_LIBRARY)
+ foreach(search ${_GDIAM_SEARCHES})
+ find_library(GDIAM_LIBRARY NAMES ${GDIAM_NAMES} NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
+ endforeach()
+endif()
+
+unset(GDIAM_NAMES)
+
+mark_as_advanced(GDIAM_INCLUDE_DIR)
+
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDIAM DEFAULT_MSG GDIAM_LIBRARY
GDIAM_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDIAM REQUIRED_VARS GDIAM_LIBRARY
GDIAM_INCLUDE_DIR)
-IF (GDIAM_FOUND)
- set(GDIAM_INCLUDE_DIRS ${GDIAM_INCLUDE_DIR})
- set(GDIAM_LIBRARIES ${GDIAM_LIBRARY})
+if(GDIAM_FOUND)
+ set(GDIAM_INCLUDE_DIRS ${GDIAM_INCLUDE_DIR})
+
+ if(NOT GDIAM_LIBRARIES)
+ set(GDIAM_LIBRARIES ${GDIAM_LIBRARY})
+ endif()
+
+ if(NOT TARGET GDIAM::GDIAM)
+ add_library(GDIAM::GDIAM UNKNOWN IMPORTED)
+ set_target_properties(GDIAM::GDIAM PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${GDIAM_INCLUDE_DIRS}")
+
+ if(GDIAM_LIBRARY_RELEASE)
+ set_property(TARGET GDIAM::GDIAM APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(GDIAM::GDIAM PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${GDIAM_LIBRARY_RELEASE}")
+ endif()
+
+ if(GDIAM_LIBRARY_DEBUG)
+ set_property(TARGET GDIAM::GDIAM APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(GDIAM::GDIAM PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${GDIAM_LIBRARY_DEBUG}")
+ endif()
+
+ if(NOT GDIAM_LIBRARY_RELEASE AND NOT GDIAM_LIBRARY_DEBUG)
+ set_property(TARGET GDIAM::GDIAM APPEND PROPERTY
+ IMPORTED_LOCATION "${GDIAM_LIBRARY}")
+ endif()
+ endif()
endif()
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindNETPBM.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindNETPBM.cmake
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindNETPBM.cmake
2020-09-29 21:13:18 UTC (rev 77278)
@@ -51,7 +51,7 @@
# Try each search configuration.
foreach(search ${_NETPBM_SEARCHES})
- find_path(NETPBM_INCLUDE_DIR NAMES pam.h ${${search}} PATH_SUFFIXES include
include/netpbm)
+ find_path(NETPBM_INCLUDE_DIR NAMES pam.h ${${search}} PATH_SUFFIXES include
include/netpbm netpbm)
endforeach()
# Allow NETPBM_LIBRARY to be set manually, as the location of the netpbm
library
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindOPENNURBS.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindOPENNURBS.cmake
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindOPENNURBS.cmake
2020-09-29 21:13:18 UTC (rev 77278)
@@ -1,63 +1,102 @@
-# F I N D O P E N N U R B S . 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.
-#
-###
-# - Find OpenNURBS
-#
-# The following variables are set:
-#
-# OPENNURBS_INCLUDE_DIRS - where to find opennurbs.h, etc.
-# OPENNURBS_LIBRARIES - List of libraries when using openNURBS
-# OPENNURBS_FOUND - True if openNURBS found.
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
-# OpenNURBS requires zlib
-find_package(ZLIB)
+#[=======================================================================[.rst:
+FindOPENNURBS
+--------
-find_path(OPENNURBS_INCLUDE_DIR opennurbs.h PATHS openNURBS)
-find_library(OPENNURBS_LIBRARY NAMES opennurbs openNURBS OpenNURBS)
+Find the native OPENNURBS includes and library.
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` target ``OPENNURBS::OPENNURBS``, if
+OPENNURBS has been found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+::
+
+ OPENNURBS_INCLUDE_DIRS - where to find opennurbs.h, etc.
+ OPENNURBS_LIBRARIES - List of libraries when using openNURBS.
+ OPENNURBS_FOUND - True if openNURBS found.
+
+Hints
+^^^^^
+
+A user may set ``OPENNURBS_ROOT`` to a openNURBS installation root to tell this
+module where to look.
+#]=======================================================================]
+
+set(_OPENNURBS_SEARCHES)
+
+# Search OPENNURBS_ROOT first if it is set.
+if(OPENNURBS_ROOT)
+ set(_OPENNURBS_SEARCH_ROOT PATHS ${OPENNURBS_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _OPENNURBS_SEARCHES _OPENNURBS_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_OPENNURBS_x86 "(x86)")
+set(_OPENNURBS_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/openNURBS"
+ "$ENV{ProgramFiles${_OPENNURBS_x86}}/openNURBS")
+unset(_OPENNURBS_x86)
+list(APPEND _OPENNURBS_SEARCHES _OPENNURBS_SEARCH_NORMAL)
+
+set(OPENNURBS_NAMES openNURBS)
+
+# Try each search configuration.
+foreach(search ${_OPENNURBS_SEARCHES})
+ find_path(OPENNURBS_INCLUDE_DIR NAMES opennurbs.h ${${search}} PATH_SUFFIXES
include include/openNURBS openNURBS)
+endforeach()
+
+# Allow OPENNURBS_LIBRARY to be set manually, as the location of the openNURBS
library
+if(NOT OPENNURBS_LIBRARY)
+ foreach(search ${_OPENNURBS_SEARCHES})
+ find_library(OPENNURBS_LIBRARY NAMES ${OPENNURBS_NAMES} NAMES_PER_DIR
${${search}} PATH_SUFFIXES lib)
+ endforeach()
+endif()
+
+unset(OPENNURBS_NAMES)
+
+mark_as_advanced(OPENNURBS_INCLUDE_DIR)
+
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENNURBS DEFAULT_MSG OPENNURBS_LIBRARY
OPENNURBS_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENNURBS REQUIRED_VARS OPENNURBS_LIBRARY
OPENNURBS_INCLUDE_DIR)
if(OPENNURBS_FOUND)
- set(OPENNURBS_INCLUDE_DIRS ${OPENNURBS_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
- list(REMOVE_DUPLICATES OPENNURBS_INCLUDE_DIR)
- set(OPENNURBS_LIBRARIES ${OPENNURBS_LIBRARY} ${ZLIB_LIBRARY})
+ set(OPENNURBS_INCLUDE_DIRS ${OPENNURBS_INCLUDE_DIR})
+
+ if(NOT OPENNURBS_LIBRARIES)
+ set(OPENNURBS_LIBRARIES ${OPENNURBS_LIBRARY})
+ endif()
+
+ if(NOT TARGET OPENNURBS::OPENNURBS)
+ add_library(OPENNURBS::OPENNURBS UNKNOWN IMPORTED)
+ set_target_properties(OPENNURBS::OPENNURBS PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${OPENNURBS_INCLUDE_DIRS}")
+
+ if(OPENNURBS_LIBRARY_RELEASE)
+ set_property(TARGET OPENNURBS::OPENNURBS APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(OPENNURBS::OPENNURBS PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${OPENNURBS_LIBRARY_RELEASE}")
+ endif()
+
+ if(OPENNURBS_LIBRARY_DEBUG)
+ set_property(TARGET OPENNURBS::OPENNURBS APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(OPENNURBS::OPENNURBS PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${OPENNURBS_LIBRARY_DEBUG}")
+ endif()
+
+ if(NOT OPENNURBS_LIBRARY_RELEASE AND NOT OPENNURBS_LIBRARY_DEBUG)
+ set_property(TARGET OPENNURBS::OPENNURBS APPEND PROPERTY
+ IMPORTED_LOCATION "${OPENNURBS_LIBRARY}")
+ endif()
+ endif()
endif()
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindPOLY2TRI.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindPOLY2TRI.cmake
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindPOLY2TRI.cmake
2020-09-29 21:13:18 UTC (rev 77278)
@@ -1,60 +1,102 @@
-# F I N D P O L Y 2 T R I . C M A K E
-# BRL-CAD
-#
-# Copyright (c) 2013-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.
-#
-###
-# - Find Constrained Delaunay Triangulation library
-#
-# The following variables are set:
-#
-# POLY2TRI_INCLUDE_DIRS - where to find poly2tri.h, etc.
-# POLY2TRI_LIBRARIES - List of libraries when using poly2tri.
-# POLY2TRI_FOUND - True if poly2tri found.
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
-find_path(POLY2TRI_INCLUDE_DIR poly2tri.h)
-find_library(POLY2TRI_LIBRARY NAMES poly2tri)
+#[=======================================================================[.rst:
+FindPOLY2TRI
+--------
+Find the native POLY2TRI includes and library.
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` target ``POLY2TRI::POLY2TRI``, if
+POLY2TRI has been found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+::
+
+ POLY2TRI_INCLUDE_DIRS - where to find poly2tri/poly2tri.h, etc.
+ POLY2TRI_LIBRARIES - List of libraries when using poly2tri.
+ POLY2TRI_FOUND - True if poly2tri found.
+
+Hints
+^^^^^
+
+A user may set ``POLY2TRI_ROOT`` to a poly2tri installation root to tell this
+module where to look.
+#]=======================================================================]
+
+set(_POLY2TRI_SEARCHES)
+
+# Search POLY2TRI_ROOT first if it is set.
+if(POLY2TRI_ROOT)
+ set(_POLY2TRI_SEARCH_ROOT PATHS ${POLY2TRI_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _POLY2TRI_SEARCHES _POLY2TRI_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_POLY2TRI_x86 "(x86)")
+set(_POLY2TRI_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/poly2tri"
+ "$ENV{ProgramFiles${_POLY2TRI_x86}}/poly2tri")
+unset(_POLY2TRI_x86)
+list(APPEND _POLY2TRI_SEARCHES _POLY2TRI_SEARCH_NORMAL)
+
+set(POLY2TRI_NAMES poly2tri)
+
+# Try each search configuration.
+foreach(search ${_POLY2TRI_SEARCHES})
+ find_path(POLY2TRI_INCLUDE_DIR NAMES poly2tri/poly2tri.h ${${search}}
PATH_SUFFIXES include include/poly2tri poly2tri)
+endforeach()
+
+# Allow POLY2TRI_LIBRARY to be set manually, as the location of the poly2tri
library
+if(NOT POLY2TRI_LIBRARY)
+ foreach(search ${_POLY2TRI_SEARCHES})
+ find_library(POLY2TRI_LIBRARY NAMES ${POLY2TRI_NAMES} NAMES_PER_DIR
${${search}} PATH_SUFFIXES lib)
+ endforeach()
+endif()
+
+unset(POLY2TRI_NAMES)
+
+mark_as_advanced(POLY2TRI_INCLUDE_DIR)
+
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(POLY2TRI DEFAULT_MSG POLY2TRI_LIBRARY
POLY2TRI_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(POLY2TRI REQUIRED_VARS POLY2TRI_LIBRARY
POLY2TRI_INCLUDE_DIR)
if(POLY2TRI_FOUND)
- set(POLY2TRI_INCLUDE_DIRS ${POLY2TRI_INCLUDE_DIR})
- set(POLY2TRI_LIBRARIES ${POLY2TRI_LIBRARY})
+ set(POLY2TRI_INCLUDE_DIRS ${POLY2TRI_INCLUDE_DIR})
+
+ if(NOT POLY2TRI_LIBRARIES)
+ set(POLY2TRI_LIBRARIES ${POLY2TRI_LIBRARY})
+ endif()
+
+ if(NOT TARGET POLY2TRI::POLY2TRI)
+ add_library(POLY2TRI::POLY2TRI UNKNOWN IMPORTED)
+ set_target_properties(POLY2TRI::POLY2TRI PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${POLY2TRI_INCLUDE_DIRS}")
+
+ if(POLY2TRI_LIBRARY_RELEASE)
+ set_property(TARGET POLY2TRI::POLY2TRI APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(POLY2TRI::POLY2TRI PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${POLY2TRI_LIBRARY_RELEASE}")
+ endif()
+
+ if(POLY2TRI_LIBRARY_DEBUG)
+ set_property(TARGET POLY2TRI::POLY2TRI APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(POLY2TRI::POLY2TRI PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${POLY2TRI_LIBRARY_DEBUG}")
+ endif()
+
+ if(NOT POLY2TRI_LIBRARY_RELEASE AND NOT POLY2TRI_LIBRARY_DEBUG)
+ set_property(TARGET POLY2TRI::POLY2TRI APPEND PROPERTY
+ IMPORTED_LOCATION "${POLY2TRI_LIBRARY}")
+ endif()
+ endif()
endif()
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindSPSR.cmake 2020-09-29
21:13:18 UTC (rev 77278)
@@ -1,60 +1,102 @@
-# F I N D S P S R . C M A K E
-# BRL-CAD
-#
-# Copyright (c) 2013-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.
-#
-###
-# - Find Screened Poisson Surface Reconstruction library
-#
-# The following variables are set:
-#
-# SPSR_INCLUDE_DIRS - where to find spsr.h, etc.
-# SPSR_LIBRARIES - List of libraries when using spsr.
-# SPSR_FOUND - True if spsr found.
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
-find_path(SPSR_INCLUDE_DIR spsr.h)
-find_library(SPSR_LIBRARY NAMES spsr spsrlib)
+#[=======================================================================[.rst:
+FindSPSR
+--------
+Find the native SPSR includes and library.
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` target ``SPSR::SPSR``, if
+SPSR has been found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+::
+
+ SPSR_INCLUDE_DIRS - where to find SPSR.h, etc.
+ SPSR_LIBRARIES - List of libraries when using spsr.
+ SPSR_FOUND - True if spsr found.
+
+Hints
+^^^^^
+
+A user may set ``SPSR_ROOT`` to a spsr installation root to tell this
+module where to look.
+#]=======================================================================]
+
+set(_SPSR_SEARCHES)
+
+# Search SPSR_ROOT first if it is set.
+if(SPSR_ROOT)
+ set(_SPSR_SEARCH_ROOT PATHS ${SPSR_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _SPSR_SEARCHES _SPSR_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_SPSR_x86 "(x86)")
+set(_SPSR_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/spsr"
+ "$ENV{ProgramFiles${_SPSR_x86}}/spsr")
+unset(_SPSR_x86)
+list(APPEND _SPSR_SEARCHES _SPSR_SEARCH_NORMAL)
+
+set(SPSR_NAMES spsr SPSR)
+
+# Try each search configuration.
+foreach(search ${_SPSR_SEARCHES})
+ find_path(SPSR_INCLUDE_DIR NAMES SPSR.h ${${search}} PATH_SUFFIXES
include include/SPSR SPSR)
+endforeach()
+
+# Allow SPSR_LIBRARY to be set manually, as the location of the spsr library
+if(NOT SPSR_LIBRARY)
+ foreach(search ${_SPSR_SEARCHES})
+ find_library(SPSR_LIBRARY NAMES ${SPSR_NAMES} NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
+ endforeach()
+endif()
+
+unset(SPSR_NAMES)
+
+mark_as_advanced(SPSR_INCLUDE_DIR)
+
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(SPSR DEFAULT_MSG SPSR_LIBRARY
SPSR_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(SPSR REQUIRED_VARS SPSR_LIBRARY
SPSR_INCLUDE_DIR)
-IF (SPSR_FOUND)
- set(SPSR_INCLUDE_DIRS ${SPSR_INCLUDE_DIR})
- set(SPSR_LIBRARIES ${SPSR_LIBRARY})
+if(SPSR_FOUND)
+ set(SPSR_INCLUDE_DIRS ${SPSR_INCLUDE_DIR})
+
+ if(NOT SPSR_LIBRARIES)
+ set(SPSR_LIBRARIES ${SPSR_LIBRARY})
+ endif()
+
+ if(NOT TARGET SPSR::SPSR)
+ add_library(SPSR::SPSR UNKNOWN IMPORTED)
+ set_target_properties(SPSR::SPSR PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${SPSR_INCLUDE_DIRS}")
+
+ if(SPSR_LIBRARY_RELEASE)
+ set_property(TARGET SPSR::SPSR APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(SPSR::SPSR PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${SPSR_LIBRARY_RELEASE}")
+ endif()
+
+ if(SPSR_LIBRARY_DEBUG)
+ set_property(TARGET SPSR::SPSR APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(SPSR::SPSR PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${SPSR_LIBRARY_DEBUG}")
+ endif()
+
+ if(NOT SPSR_LIBRARY_RELEASE AND NOT SPSR_LIBRARY_DEBUG)
+ set_property(TARGET SPSR::SPSR APPEND PROPERTY
+ IMPORTED_LOCATION "${SPSR_LIBRARY}")
+ endif()
+ endif()
endif()
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindVDS.cmake 2020-09-29
21:13:18 UTC (rev 77278)
@@ -1,60 +1,102 @@
-# F I N D V D S . C M A K E
-# BRL-CAD
-#
-# Copyright (c) 2013-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.
-#
-###
-# - Find View Dependent Simplification library
-#
-# The following variables are set:
-#
-# VDS_INCLUDE_DIRS - where to find vds.h, etc.
-# VDS_LIBRARIES - List of libraries when using vds.
-# VDS_FOUND - True if vds found.
+# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
-find_path(VDS_INCLUDE_DIR vds.h)
-find_library(VDS_LIBRARY NAMES vds vdslib)
+#[=======================================================================[.rst:
+FindVDS
+--------
+Find the native VDS includes and library.
+
+IMPORTED Targets
+^^^^^^^^^^^^^^^^
+
+This module defines :prop_tgt:`IMPORTED` target ``VDS::VDS``, if
+VDS has been found.
+
+Result Variables
+^^^^^^^^^^^^^^^^
+
+This module defines the following variables:
+
+::
+
+ VDS_INCLUDE_DIRS - where to find vds.h, etc.
+ VDS_LIBRARIES - List of libraries when using vds.
+ VDS_FOUND - True if vds found.
+
+Hints
+^^^^^
+
+A user may set ``VDS_ROOT`` to a vds installation root to tell this
+module where to look.
+#]=======================================================================]
+
+set(_VDS_SEARCHES)
+
+# Search VDS_ROOT first if it is set.
+if(VDS_ROOT)
+ set(_VDS_SEARCH_ROOT PATHS ${VDS_ROOT} NO_DEFAULT_PATH)
+ list(APPEND _VDS_SEARCHES _VDS_SEARCH_ROOT)
+endif()
+
+# Normal search.
+set(_VDS_x86 "(x86)")
+set(_VDS_SEARCH_NORMAL
+ PATHS "$ENV{ProgramFiles}/vds"
+ "$ENV{ProgramFiles${_VDS_x86}}/vds")
+unset(_VDS_x86)
+list(APPEND _VDS_SEARCHES _VDS_SEARCH_NORMAL)
+
+set(VDS_NAMES vds)
+
+# Try each search configuration.
+foreach(search ${_VDS_SEARCHES})
+ find_path(VDS_INCLUDE_DIR NAMES vds.h ${${search}} PATH_SUFFIXES include
include/vds vds)
+endforeach()
+
+# Allow VDS_LIBRARY to be set manually, as the location of the vds library
+if(NOT VDS_LIBRARY)
+ foreach(search ${_VDS_SEARCHES})
+ find_library(VDS_LIBRARY NAMES ${VDS_NAMES} NAMES_PER_DIR ${${search}}
PATH_SUFFIXES lib)
+ endforeach()
+endif()
+
+unset(VDS_NAMES)
+
+mark_as_advanced(VDS_INCLUDE_DIR)
+
include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(VDS DEFAULT_MSG VDS_LIBRARY VDS_INCLUDE_DIR)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(VDS REQUIRED_VARS VDS_LIBRARY
VDS_INCLUDE_DIR)
-IF (VDS_FOUND)
- set(VDS_INCLUDE_DIRS ${VDS_INCLUDE_DIR})
- set(VDS_LIBRARIES ${VDS_LIBRARY})
+if(VDS_FOUND)
+ set(VDS_INCLUDE_DIRS ${VDS_INCLUDE_DIR})
+
+ if(NOT VDS_LIBRARIES)
+ set(VDS_LIBRARIES ${VDS_LIBRARY})
+ endif()
+
+ if(NOT TARGET VDS::VDS)
+ add_library(VDS::VDS UNKNOWN IMPORTED)
+ set_target_properties(VDS::VDS PROPERTIES
+ INTERFACE_INCLUDE_DIRECTORIES "${VDS_INCLUDE_DIRS}")
+
+ if(VDS_LIBRARY_RELEASE)
+ set_property(TARGET VDS::VDS APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(VDS::VDS PROPERTIES
+ IMPORTED_LOCATION_RELEASE "${VDS_LIBRARY_RELEASE}")
+ endif()
+
+ if(VDS_LIBRARY_DEBUG)
+ set_property(TARGET VDS::VDS APPEND PROPERTY
+ IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(VDS::VDS PROPERTIES
+ IMPORTED_LOCATION_DEBUG "${VDS_LIBRARY_DEBUG}")
+ endif()
+
+ if(NOT VDS_LIBRARY_RELEASE AND NOT VDS_LIBRARY_DEBUG)
+ set_property(TARGET VDS::VDS APPEND PROPERTY
+ IMPORTED_LOCATION "${VDS_LIBRARY}")
+ endif()
+ endif()
endif()
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/thirdparty_rework/src/adrt/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/adrt/CMakeLists.txt 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/adrt/CMakeLists.txt 2020-09-29
21:13:18 UTC (rev 77278)
@@ -1,3 +1,5 @@
+find_package(ZLIB)
+
set(ADRT_INCLUDE_DIRS
${GCV_INCLUDE_DIRS}
${BRLCAD_SOURCE_DIR}/src/adrt
Modified: brlcad/branches/thirdparty_rework/src/adrt/master/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/adrt/master/CMakeLists.txt
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/adrt/master/CMakeLists.txt
2020-09-29 21:13:18 UTC (rev 77278)
@@ -1,3 +1,5 @@
+find_package(ZLIB)
+
set(ADRT_MASTER_SOURCES
../tienet.c
compnet.c
@@ -6,7 +8,7 @@
tienet_master.c
)
-BRLCAD_ADDEXEC(adrt_master "${ADRT_MASTER_SOURCES}" librt)
+BRLCAD_ADDEXEC(adrt_master "${ADRT_MASTER_SOURCES}" "librt;${ZLIB_LIBRARY}")
set(adrt_master_ignore_files
CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/libbg/CMakeLists.txt 2020-09-29
21:13:18 UTC (rev 77278)
@@ -4,8 +4,8 @@
${BRLCAD_SOURCE_DIR}/include
${BN_INCLUDE_DIRS}
${BU_INCLUDE_DIRS}
- ${POLY2TRI_INCLUDE_DIRS}
- ${SPSR_INCLUDE_DIRS}
+ ${POLY2TRI_INCLUDE_DIR}
+ ${SPSR_INCLUDE_DIR}
)
BRLCAD_LIB_INCLUDE_DIRS(bg BG_INCLUDE_DIRS "")
@@ -32,7 +32,7 @@
util.c
)
-BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}"
"libbn;libbu;${SPSR_LIBRARIES};${POLY2TRI_LIBRARIES}")
+BRLCAD_ADDLIB(libbg "${LIBBG_SOURCES}"
"libbn;libbu;${SPSR_LIBRARY};${POLY2TRI_LIBRARY}")
set_target_properties(libbg PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (HIDE_INTERNAL_SYMBOLS)
set_property(TARGET libbg APPEND PROPERTY COMPILE_DEFINITIONS
"SPSR_DLL_IMPORTS")
Modified: brlcad/branches/thirdparty_rework/src/libbrep/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbrep/CMakeLists.txt
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/libbrep/CMakeLists.txt
2020-09-29 21:13:18 UTC (rev 77278)
@@ -4,8 +4,8 @@
${BRLCAD_SOURCE_DIR}/include
${BU_INCLUDE_DIRS}
${BN_INCLUDE_DIRS}
- ${POLY2TRI_INCLUDE_DIRS}
- ${OPENNURBS_INCLUDE_DIRS}
+ ${POLY2TRI_INCLUDE_DIR}
+ ${OPENNURBS_INCLUDE_DIR}
)
# locally used but not needed by users of the library
@@ -61,7 +61,7 @@
)
CMAKEFILES(${libbrep_ignored_files})
-BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbg;libbn;libbu;${OPENNURBS_LIBRARIES};${POLY2TRI_LIBRARIES};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
+BRLCAD_ADDLIB(libbrep "${LIBBREP_SOURCES}"
"libbg;libbn;libbu;${OPENNURBS_LIBRARY};${POLY2TRI_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
set_target_properties(libbrep PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(HIDE_INTERNAL_SYMBOLS)
Modified: brlcad/branches/thirdparty_rework/src/libdm/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libdm/CMakeLists.txt 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/libdm/CMakeLists.txt 2020-09-29
21:13:18 UTC (rev 77278)
@@ -1,3 +1,5 @@
+find_package(PNG)
+
# Include directories needed by libdm users
set(DM_INCLUDE_DIRS
${BRLCAD_BINARY_DIR}/include
@@ -7,7 +9,7 @@
${ICV_INCLUDE_DIRS}
${RT_INCLUDE_DIRS}
${X11_INCLUDE_DIR}
- ${PNG_INCLUDE_DIRS}
+ ${PNG_INCLUDE_DIR}
)
# local includes
@@ -83,7 +85,7 @@
)
set_property(SOURCE dm_obj.c APPEND PROPERTY COMPILE_DEFINITIONS
FB_USE_INTERNAL_API)
set_property(SOURCE dm_init.cpp APPEND PROPERTY COMPILE_DEFINITIONS
"DM_PLUGIN_SUFFIX=\"${CMAKE_SHARED_LIBRARY_SUFFIX}\"")
-BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}"
"librt;libicv;libbu;libpkg;${OPENGL_LIBRARIES};${PNG_LIBRARIES}")
+BRLCAD_ADDLIB(libdm "${LIBDM_SRCS}"
"librt;libicv;libbu;libpkg;${OPENGL_LIBRARIES};${PNG_LIBRARY}")
set_target_properties(libdm PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (TARGET profont_ProFont_ttf_cp)
Modified: brlcad/branches/thirdparty_rework/src/libicv/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libicv/CMakeLists.txt 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/libicv/CMakeLists.txt 2020-09-29
21:13:18 UTC (rev 77278)
@@ -1,9 +1,11 @@
+find_package(PNG)
+
set(ICV_INCLUDE_DIRS
${BRLCAD_BINARY_DIR}/include
${BRLCAD_SOURCE_DIR}/include
${BU_INCLUDE_DIRS}
- ${PNG_INCLUDE_DIRS}
- ${NETPBM_INCLUDE_DIRS}
+ ${PNG_INCLUDE_DIR}
+ ${NETPBM_INCLUDE_DIR}
)
BRLCAD_LIB_INCLUDE_DIRS(icv ICV_INCLUDE_DIRS "")
@@ -24,7 +26,7 @@
dpix.c
)
-BRLCAD_ADDLIB(libicv "${LIBICV_SOURCES}"
"libbu;libbn;${PNG_LIBRARIES};${NETPBM_LIBRARIES}")
+BRLCAD_ADDLIB(libicv "${LIBICV_SOURCES}"
"libbu;libbn;${PNG_LIBRARY};${NETPBM_LIBRARY}")
set_target_properties(libicv PROPERTIES VERSION 20.0.1 SOVERSION 20)
if (HIDE_INTERNAL_SYMBOLS)
if (TARGET netpbm OR HIDE_INTERNAL_SYMBOLS_EXT)
Modified: brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt 2020-09-29
21:13:18 UTC (rev 77278)
@@ -18,9 +18,9 @@
# locally used but not needed by users of the library
set(RT_LOCAL_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
- ${REGEX_INCLUDE_DIRS}
- ${VDS_INCLUDE_DIRS}
- ${GDIAM_INCLUDE_DIRS}
+ ${REGEX_INCLUDE_DIR}
+ ${VDS_INCLUDE_DIR}
+ ${GDIAM_INCLUDE_DIR}
)
BRLCAD_LIB_INCLUDE_DIRS(rt RT_INCLUDE_DIRS RT_LOCAL_INCLUDE_DIRS)
@@ -358,10 +358,10 @@
endif(BRLCAD_ENABLE_OPENCL)
if(BRLCAD_ENABLE_SPR)
- set(SPR_LIB ${SPSR_LIBRARIES})
+ set(SPR_LIB ${SPSR_LIBRARY})
endif(BRLCAD_ENABLE_SPR)
-BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${OPENCL_LIBS};${GDIAM_LIBRARIES};${VDS_LIBRARIES};libbrep;libnmg;libbg;libbn;libbu;${OPENNURBS_LIBRARIES};${SPR_LIB};${REGEX_LIBRARIES};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
+BRLCAD_ADDLIB(librt "${LIBRT_SOURCES}"
"${OPENCL_LIBS};${GDIAM_LIBRARY};${VDS_LIBRARY};libbrep;libnmg;libbg;libbn;libbu;${OPENNURBS_LIBRARY};${SPR_LIB};${REGEX_LIBRARY};${WINSOCK_LIB};${RPCRT_LIB};${STDCXX_LIBRARIES}")
set_target_properties(librt PROPERTIES VERSION 20.0.1 SOVERSION 20)
if(HIDE_INTERNAL_SYMBOLS)
Modified: brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-09-29
21:13:18 UTC (rev 77278)
@@ -70,7 +70,6 @@
find_package(PERPLEX)
find_package(REGEX)
find_package(ZLIB)
-find_package(PNG)
find_package(NETPBM)
find_package(UTAHRLE)
find_package(OPENNURBS)
@@ -87,6 +86,8 @@
find_package(TCL)
+CONFIG_H_APPEND(BRLCAD "#cmakedefine ITCL_VERSION \"${ITCL_VERSION}\"\n")
+
if(0)
# OpenSceneGraph Libraries
set(openscenegraph_DESCRIPTION "
Modified: brlcad/branches/thirdparty_rework/src/other/libgdiam/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/libgdiam/CMakeLists.txt
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/other/libgdiam/CMakeLists.txt
2020-09-29 21:13:18 UTC (rev 77278)
@@ -47,9 +47,7 @@
ARCHIVE DESTINATION ${LIB_DIR})
endif (BUILD_STATIC_LIBS)
-if (NOT SKIP_INSTALL_HEADERS)
install(FILES gdiam.hpp DESTINATION ${INCLUDE_DIR})
-endif (NOT SKIP_INSTALL_HEADERS)
if (ENABLE_GDIAM_TESTING)
# Enable ctest
Modified: brlcad/branches/thirdparty_rework/src/other/libnetpbm/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/libnetpbm/CMakeLists.txt
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/other/libnetpbm/CMakeLists.txt
2020-09-29 21:13:18 UTC (rev 77278)
@@ -135,11 +135,10 @@
ppm.h
ppmcmap.h
ppmfloyd.h
+ ${CMAKE_CURRENT_BINARY_DIR}/pm_config.h
)
-if (NOT SKIP_INSTALL_HEADERS)
- install (FILES ${NETPBM_HEADERS} DESTINATION ${INCLUDE_DIR}/netpbm)
-endif (NOT SKIP_INSTALL_HEADERS)
+install (FILES ${NETPBM_HEADERS} DESTINATION ${INCLUDE_DIR}/netpbm)
if (NOT DEFINED BUILD_SHARED_LIBS)
Modified: brlcad/branches/thirdparty_rework/src/other/libspsr/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/libspsr/CMakeLists.txt
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/other/libspsr/CMakeLists.txt
2020-09-29 21:13:18 UTC (rev 77278)
@@ -69,9 +69,7 @@
Src/SPSR.h
Src/cvertex.h
)
-if (NOT SKIP_INSTALL_HEADERS)
- install (FILES ${SPSR_HDRS} DESTINATION ${INCLUDE_DIR}/SPSR)
-endif (NOT SKIP_INSTALL_HEADERS)
+install (FILES ${SPSR_HDRS} DESTINATION ${INCLUDE_DIR}/SPSR)
if(MSVC)
add_definitions("-DSPSR_DLL_EXPORTS")
Modified: brlcad/branches/thirdparty_rework/src/other/poly2tri/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/poly2tri/CMakeLists.txt
2020-09-29 18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/other/poly2tri/CMakeLists.txt
2020-09-29 21:13:18 UTC (rev 77278)
@@ -86,11 +86,9 @@
poly2tri/sweep/sweep.h
poly2tri/sweep/sweep_context.h
)
-if (NOT SKIP_INSTALL_HEADERS)
- install(FILES ${SWEEP_HDRS} DESTINATION ${INCLUDE_DIR}/poly2tri/sweep)
- install(FILES poly2tri/poly2tri.h DESTINATION ${INCLUDE_DIR}/poly2tri)
- install(FILES poly2tri/common/shapes.h DESTINATION
${INCLUDE_DIR}/poly2tri/common)
-endif (NOT SKIP_INSTALL_HEADERS)
+install(FILES ${SWEEP_HDRS} DESTINATION ${INCLUDE_DIR}/poly2tri/sweep)
+install(FILES poly2tri/poly2tri.h DESTINATION ${INCLUDE_DIR}/poly2tri)
+install(FILES poly2tri/common/shapes.h DESTINATION
${INCLUDE_DIR}/poly2tri/common)
set(SOURCES
poly2tri/common/shapes.cc
Modified: brlcad/branches/thirdparty_rework/src/rt/do.c
===================================================================
--- brlcad/branches/thirdparty_rework/src/rt/do.c 2020-09-29 18:55:20 UTC
(rev 77277)
+++ brlcad/branches/thirdparty_rework/src/rt/do.c 2020-09-29 21:13:18 UTC
(rev 77278)
@@ -26,6 +26,7 @@
#include "common.h"
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-09-29
21:13:18 UTC (rev 77278)
@@ -39,7 +39,7 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_INSTALL_LIBDIR=${LIB_DIR}
-DCMAKE_PREFIX_PATH=${CMAKE_BINARY_DIR}/${LIB_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
- -DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_FILES=ON
-DSKIP_INSTALL_EXECUTABLES=ON
+ -DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_EXECUTABLES=ON
-DSKIP_INSTALL_EXPORT=ON -DPNG_TESTS=OFF -Dld-version-script=OFF
-DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}>
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
-DPNG_LIB_NAME=${PNG_LIB_NAME} -DPNG_PREFIX=brl_
Modified: brlcad/branches/thirdparty_rework/src/util/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/util/CMakeLists.txt 2020-09-29
18:55:20 UTC (rev 77277)
+++ brlcad/branches/thirdparty_rework/src/util/CMakeLists.txt 2020-09-29
21:13:18 UTC (rev 77278)
@@ -11,8 +11,8 @@
set(UTIL_LOCAL_INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}
- ${UTAHRLE_INCLUDE_DIRS}
- ${PNG_INCLUDE_DIRS}
+ ${UTAHRLE_INCLUDE_DIR}
+ ${PNG_INCLUDE_DIR}
)
set(UTIL_ALL_INCLUDE_DIRS ${UTIL_INCLUDE_DIRS} ${UTIL_LOCAL_INCLUDE_DIRS})
@@ -50,7 +50,7 @@
BRLCAD_ADDEXEC(bw-a bw-a.c "libdm;libbu")
ADD_TARGET_DEPS(bw-a dm_plugins)
BRLCAD_ADDEXEC(bw-pix bw-pix.c "libbu;libicv")
-BRLCAD_ADDEXEC(bw-png bw-png.c "libdm;libbu;${PNG_LIBRARIES}")
+BRLCAD_ADDEXEC(bw-png bw-png.c "libdm;libbu;${PNG_LIBRARY}")
ADD_TARGET_DEPS(bw-png dm_plugins)
BRLCAD_ADDEXEC(bw-ps bw-ps.c libbu)
BRLCAD_ADDEXEC(bwcrop bwcrop.c libbu)
@@ -86,7 +86,7 @@
BRLCAD_ADDEXEC(random random.c "libbn;libbu")
BRLCAD_ADDEXEC(pix-alias pix-alias.c libbu)
BRLCAD_ADDEXEC(pix-bw pix-bw.c "libbu;libicv")
-BRLCAD_ADDEXEC(pix-png pix-png.c "libdm;libbu;${PNG_LIBRARIES}")
+BRLCAD_ADDEXEC(pix-png pix-png.c "libdm;libbu;${PNG_LIBRARY}")
ADD_TARGET_DEPS(pix-png dm_plugins)
BRLCAD_ADDEXEC(pix-ppm pix-ppm.c "libdm;libbu")
ADD_TARGET_DEPS(pix-ppm dm_plugins)
@@ -139,8 +139,8 @@
BRLCAD_ADDEXEC(plot3line2 plot3line2.c "libbn;libbu")
BRLCAD_ADDEXEC(plot3rot plot3rot.c "libbn;libbu;${M_LIBRARY}")
BRLCAD_ADDEXEC(plot3stat plot3stat.c libbu)
-BRLCAD_ADDEXEC(png-bw png-bw.c "libbn;libbu;${PNG_LIBRARIES}")
-BRLCAD_ADDEXEC(png-pix png-pix.c "libbn;libbu;${PNG_LIBRARIES}")
+BRLCAD_ADDEXEC(png-bw png-bw.c "libbn;libbu;${PNG_LIBRARY}")
+BRLCAD_ADDEXEC(png-pix png-pix.c "libbn;libbu;${PNG_LIBRARY}")
BRLCAD_ADDEXEC(sun-pix sun-pix.c libbu)
BRLCAD_ADDEXEC(terrain terrain.c "libbn;libbu;${M_LIBRARY}")
#FIXME - Need to look at pcattcp port to Windows - ttcp should be
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
