Revision: 77548
http://sourceforge.net/p/brlcad/code/77548
Author: starseeker
Date: 2020-10-22 17:14:19 +0000 (Thu, 22 Oct 2020)
Log Message:
-----------
Pull in adjustments for build systems that will not be using ExternalProject_Add
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/openNURBS/CMakeLists.txt
brlcad/branches/extbuild/src/other/poly2tri/CMakeLists.txt
brlcad/branches/extbuild/src/other/tkhtml/CMakeLists.txt
brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt
Removed Paths:
-------------
brlcad/branches/extbuild/src/other/tkhtml/TCL_PKGINDEX.cmake
Modified: brlcad/branches/extbuild/src/other/openNURBS/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/openNURBS/CMakeLists.txt 2020-10-22
17:02:28 UTC (rev 77547)
+++ brlcad/branches/extbuild/src/other/openNURBS/CMakeLists.txt 2020-10-22
17:14:19 UTC (rev 77548)
@@ -350,6 +350,7 @@
# Based on the options, define libraries as either stand-alone builds
# or dependencies on OBJECT library builds
if(NOT USE_OBJECT_LIBS)
+
if(BUILD_SHARED_LIBS)
add_library(openNURBS SHARED ${OPENNURBS_SOURCES})
if(MSVC)
@@ -356,11 +357,23 @@
set_property(TARGET openNURBS APPEND PROPERTY COMPILE_DEFINITIONS
"ON_DLL_EXPORTS")
endif(MSVC)
endif(BUILD_SHARED_LIBS)
+
if(BUILD_STATIC_LIBS)
add_library(openNURBS-static STATIC ${OPENNURBS_SOURCES})
endif(BUILD_STATIC_LIBS)
+
else(NOT USE_OBJECT_LIBS)
+
add_library(openNURBS-obj OBJECT ${OPENNURBS_SOURCES})
+
+ # For build ordering, if we are linking to another build target make sure
+ # the object build depends on that target
+ foreach(DEP ${OPENNURBS_LINKLIBRARIES})
+ if(TARGET ${DEP})
+ add_dependencies(openNURBS-obj ${DEP})
+ endif(TARGET ${DEP})
+ endforeach(DEP ${OPENNURBS_LINKLIBRARIES})
+
if(BUILD_SHARED_LIBS)
add_library(openNURBS SHARED $<TARGET_OBJECTS:openNURBS-obj>)
if(MSVC)
Modified: brlcad/branches/extbuild/src/other/poly2tri/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/poly2tri/CMakeLists.txt 2020-10-22
17:02:28 UTC (rev 77547)
+++ brlcad/branches/extbuild/src/other/poly2tri/CMakeLists.txt 2020-10-22
17:14:19 UTC (rev 77548)
@@ -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/extbuild/src/other/tkhtml/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/tkhtml/CMakeLists.txt 2020-10-22
17:02:28 UTC (rev 77547)
+++ brlcad/branches/extbuild/src/other/tkhtml/CMakeLists.txt 2020-10-22
17:14:19 UTC (rev 77548)
@@ -1,11 +1,3 @@
-# Minimum required version of CMake
-cmake_minimum_required(VERSION 3.14)
-
-# set CMake project name
-project(TKHTML)
-
-find_package(TCL)
-
if (TK_SYSTEM_GRAPHICS MATCHES "x11")
find_package(X11)
endif (TK_SYSTEM_GRAPHICS MATCHES "x11")
@@ -74,13 +66,6 @@
src/swproc.c
)
-if (NOT LIB_DIR)
- if (NOT WIN32)
- set(LIB_DIR lib)
- else (NOT WIN32)
- set(LIB_DIR bin)
- endif (NOT WIN32)
-endif (NOT LIB_DIR)
add_library(Tkhtml SHARED ${TKHTML_SRCS})
if (TK_SYSTEM_GRAPHICS MATCHES "aqua")
@@ -99,7 +84,7 @@
LIBRARY DESTINATION ${LIB_DIR}
ARCHIVE DESTINATION ${LIB_DIR})
-include(TCL_PKGINDEX.cmake)
+include(TCL_PKGINDEX)
TCL_PKGINDEX(Tkhtml ${TKHTML_PKGNAME} ${TKHTML_PKGVERSION})
add_custom_command(
Deleted: brlcad/branches/extbuild/src/other/tkhtml/TCL_PKGINDEX.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/tkhtml/TCL_PKGINDEX.cmake
2020-10-22 17:02:28 UTC (rev 77547)
+++ brlcad/branches/extbuild/src/other/tkhtml/TCL_PKGINDEX.cmake
2020-10-22 17:14:19 UTC (rev 77548)
@@ -1,80 +0,0 @@
-#=============================================================================
-#
-# Copyright (c) 2010-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# * 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.
-#
-# * The names of the authors may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "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 COPYRIGHT
-# HOLDER OR CONTRIBUTORS 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.
-#=============================================================================
-
-#============================================================
-# TCL_PKGINDEX
-#============================================================
-function(TCL_PKGINDEX target pkgname pkgversion)
-
- # Identify the shared library suffix to be used
- set(lname
${CMAKE_SHARED_LIBRARY_PREFIX}${target}${CMAKE_SHARED_LIBRARY_SUFFIX})
-
- # Create a "working" pkgIndex.tcl file that will allow
- # the package to work from the build directory
- set(lld_install "${LIB_DIR}")
- if(MSVC)
- set(lld_install "${BIN_DIR}")
- endif(MSVC)
- if(NOT CMAKE_CONFIGURATION_TYPES)
- set(lld_build "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
- set(bpkgindex
"${CMAKE_BINARY_DIR}/lib/${pkgname}${pkgversion}/pkgIndex.tcl")
- file(WRITE "${bpkgindex}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir \"${lld_build}\" ${lname}] ${pkgname}]")
- DISTCLEAN("${CMAKE_BINARY_DIR}/lib/${pkgname}${pkgversion}")
- else(NOT CMAKE_CONFIGURATION_TYPES)
- foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- set(bpkgindex
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}/${pkgname}${pkgversion}/pkgIndex.tcl")
- set(lld_build "${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}")
- if(MSVC)
- set(lld_build "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}")
- endif(MSVC)
- file(WRITE "${bpkgindex}" "package ifneeded ${pkgname} ${pkgversion}
[list load [file join $dir \"${lld_build}\" ${lname}] ${pkgname}]")
-
DISTCLEAN(${CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CFG_TYPE_UPPER}}/${pkgname}${pkgversion})
- endforeach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- endif(NOT CMAKE_CONFIGURATION_TYPES)
-
- # Create the file Tcl will use once installed
- set(ipkgindex "${CMAKE_CURRENT_BINARY_DIR}/pkgIndex.tcl")
- file(WRITE "${ipkgindex}" "package ifneeded ${pkgname} ${pkgversion} [list
load [file join $dir .. .. \"${lld_install}\" ${lname}] ${pkgname}]")
- install(FILES "${ipkgindex}" DESTINATION lib/${pkgname}${pkgversion})
- DISTCLEAN("${ipkgindex}")
-
-endfunction(TCL_PKGINDEX)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt 2020-10-22
17:02:28 UTC (rev 77547)
+++ brlcad/branches/extbuild/src/other/tktable/CMakeLists.txt 2020-10-22
17:14:19 UTC (rev 77548)
@@ -32,7 +32,7 @@
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TKTABLE_CFLAGS}")
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h
COMMAND ${TCL_TCLSH} ${CMAKE_CURRENT_SOURCE_DIR}/misc/tkTable_header.tcl
${CMAKE_CURRENT_SOURCE_DIR}/library/tkTable.tcl
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h.new
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h.new
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h
@@ -39,7 +39,7 @@
COMMAND ${CMAKE_COMMAND} -E remove
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h.new
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/library/tkTable.tcl
${CMAKE_CURRENT_SOURCE_DIR}/misc/tkTable_header.tcl ${TCL_TCLSH}
)
-ADD_CUSTOM_TARGET(tktable_header_gen ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h)
+add_custom_target(tktable_header_gen ALL DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/tkTable.tcl.h)
set(TKTABLE_SRCS
generic/tkTable.c
@@ -78,6 +78,7 @@
ARCHIVE DESTINATION ${LIB_DIR})
# Create the pkgIndex.tcl file.
+include(TCL_PKGINDEX)
TCL_PKGINDEX(Tktable ${TKTABLE_PKGNAME} ${TKTABLE_PKGVERSION})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.txt DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
@@ -96,7 +97,7 @@
file(COPY ${TKTABLE_MISC} DESTINATION
${CMAKE_BINARY_DIR}/lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
endif(CMAKE_CONFIGURATION_TYPES)
-INSTALL(FILES ${TKTABLE_MISC} DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
+install(FILES ${TKTABLE_MISC} DESTINATION
lib/${TKTABLE_PKGNAME}${TKTABLE_PKGVERSION})
# Local Variables:
# tab-width: 8
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
