Revision: 77471
http://sourceforge.net/p/brlcad/code/77471
Author: starseeker
Date: 2020-10-17 15:12:03 +0000 (Sat, 17 Oct 2020)
Log Message:
-----------
See if we can eliminate the wrapping of configure_file
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/db/CMakeLists.txt
brlcad/trunk/doc/docbook/system/man5/CMakeLists.txt
brlcad/trunk/regress/icv/CMakeLists.txt
brlcad/trunk/regress/nurbs/CMakeLists.txt
brlcad/trunk/regress/pkg/CMakeLists.txt
brlcad/trunk/src/libbn/tests/CMakeLists.txt
brlcad/trunk/src/libbu/tests/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev 77470)
+++ brlcad/trunk/CMakeLists.txt 2020-10-17 15:12:03 UTC (rev 77471)
@@ -339,73 +339,6 @@
endif("${CMAKE_GENERATOR}" MATCHES "Ninja")
#---------------------------------------------------------------------
-# By default (as of version 2.8.2) CMake does not provide access to
-# global lists of executable and library targets. This is useful
-# in a number of situations related to formulating custom rules and
-# target dependency management. To avoid the necessity of replacing
-# add_library and add_executable calls with custom macros, override
-# the function names and call the _add_* functions to access the CMake
-# functionality previously available under the add_* functions. See
-# http://www.cmake.org/pipermail/cmake/2010-September/039388.html
-
-# To allow a hypothetical parent build to disable this mechanism and
-# replace it, we wrap the whole show in an IF conditional. To avoid
-# the distcheck setup, the parent file should define the variable
-# BRLCAD_IS_SUBBUILD to ON. Note that this also disables the
-# liblib prefix check in add_library, making that the responsibility
-# of the parent build as well, and disables the mechanism for ensuring
-# that the timing code runs at the correct points during the build.
-
-# We also need to provide bookkeeping logic here for the distribution
-# verification or "distcheck" routines that will validate the state
-# of the source tree against that expected and accounted for in the
-# build files. The global coverage needed for the purpose results in
-# the add_library/add_executable command override mechanism having
-# to serve two purposes at once; since we only override these functions
-# once the logic for both jobs is intertwined below.
-
-if(NOT BRLCAD_IS_SUBBUILD)
-
- # Override and wrap configure_file. In the case of configure_file, we'll
- # check that the file is part of the source tree and not itself a
- # generated file, but not reject full-path entries since there are quite a
- # few of them. This means that, unlike CMAKEFILES's reliance on full vs.
- # relative path comparisons, generated files supplied to configure_file
- # need to have the GENERATED property set in order to reliably tell which
- # files should be added to the build system's lists. Not
- # so critical with not-in-src-dir builds, but makes a big difference
- # spotting files to avoid when all generated files have source directory
- # prefixes.
- function(configure_file file targetfile)
- _configure_file(${file} ${targetfile} ${ARGN})
- # Tag output from configure with the GENERATED tag
- set_source_files_properties(${targetfile} PROPERTIES GENERATED TRUE)
- # If it's a generated file, don't register it
- get_property(IS_GENERATED SOURCE ${file} PROPERTY GENERATED)
- if(NOT IS_GENERATED)
- get_filename_component(item_absolute ${file} ABSOLUTE)
- # If we're not in the source dir, we can do some extra checking.
- if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
- IS_SUBPATH("${CMAKE_BINARY_DIR}" "${item_absolute}" SUBPATH_TEST)
- else(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
- set(SUBPATH_TEST "0")
- endif(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
- if("${SUBPATH_TEST}" STREQUAL "0")
- IS_SUBPATH("${CMAKE_SOURCE_DIR}" "${item_absolute}" SUBPATH_TEST)
- if("${SUBPATH_TEST}" STREQUAL "1")
- set_property(GLOBAL APPEND PROPERTY CMAKE_IGNORE_FILES
"${item_absolute}")
- endif("${SUBPATH_TEST}" STREQUAL "1")
- else("${SUBPATH_TEST}" STREQUAL "0")
- message(WARNING "The generated file ${file} is passed to configure_file
but does not have the GENERATED source file property set in CMake. It is
HIGHLY recommended that the GENERATED property be set for this file in
\"${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt\" using a command with the
following form:\nset_source_files_properties(<file> PROPERTIES GENERATED
TRUE)\n(or in \"${CMAKE_SOURCE_DIR}/src/other/CMakeLists.txt\" for third party
components with their own build system.)\n")
- endif("${SUBPATH_TEST}" STREQUAL "0")
- endif(NOT IS_GENERATED)
- if(NOT ${targetfile} MATCHES "distclean")
- DISTCLEAN(${targetfile})
- endif(NOT ${targetfile} MATCHES "distclean")
- endfunction(configure_file)
-
-endif(NOT BRLCAD_IS_SUBBUILD)
-
# "make check" runs all of the tests (unit, benchmark, and regression) that
are expected to work.
if(NOT BRLCAD_IS_SUBBUILD)
include(ProcessorCount)
Modified: brlcad/trunk/db/CMakeLists.txt
===================================================================
--- brlcad/trunk/db/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev 77470)
+++ brlcad/trunk/db/CMakeLists.txt 2020-10-17 15:12:03 UTC (rev 77471)
@@ -226,12 +226,13 @@
${G_SAMPLE_MODELS}
CMakeLists.txt
aet.rt
+ conv_run.cmake.in
cornell.rt
cube.rt
db.php
include/ctype.inc
include/debug.inc
-)
+ )
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/doc/docbook/system/man5/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/docbook/system/man5/CMakeLists.txt 2020-10-17 14:49:01 UTC
(rev 77470)
+++ brlcad/trunk/doc/docbook/system/man5/CMakeLists.txt 2020-10-17 15:12:03 UTC
(rev 77471)
@@ -35,7 +35,10 @@
set(attribute_DEPS attr_std_list_xml attr_std_table_xml)
ADD_DOCBOOK("HTML;PHP;MAN5;PDF" man5_EN man5 "${attribute_DEPS}")
-CMAKEFILES(CMakeLists.txt)
+CMAKEFILES(
+ CMakeLists.txt
+ attributes.xml.in
+ )
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/regress/icv/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/icv/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev
77470)
+++ brlcad/trunk/regress/icv/CMakeLists.txt 2020-10-17 15:12:03 UTC (rev
77471)
@@ -122,6 +122,8 @@
m35.ppm.tbz2
m35.dpix.tbz2
m35.bw.tbz2
+ regress-icv_export.cmake.in
+ regress-icv_import.cmake.in
)
# Local Variables:
Modified: brlcad/trunk/regress/nurbs/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/nurbs/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev
77470)
+++ brlcad/trunk/regress/nurbs/CMakeLists.txt 2020-10-17 15:12:03 UTC (rev
77471)
@@ -37,9 +37,10 @@
DISTCLEAN(${CMAKE_CURRENT_BINARY_DIR}/regress-nurbs_${NHIT_NAME}.log)
CMAKEFILES(
+ CMakeLists.txt
brep-3dm.tar.bz2
+ regress-nurbs-test.cmake.in
sph.g
- CMakeLists.txt
)
# Local Variables:
Modified: brlcad/trunk/regress/pkg/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/pkg/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev
77470)
+++ brlcad/trunk/regress/pkg/CMakeLists.txt 2020-10-17 15:12:03 UTC (rev
77471)
@@ -13,6 +13,7 @@
CMAKEFILES(
CMakeLists.txt
+ regress-pkg.cmake.in
)
# Local Variables:
# tab-width: 8
Modified: brlcad/trunk/src/libbn/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbn/tests/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev
77470)
+++ brlcad/trunk/src/libbn/tests/CMakeLists.txt 2020-10-17 15:12:03 UTC (rev
77471)
@@ -1137,11 +1137,14 @@
add_test(NAME bn_vlist_cmd_cnt_45 COMMAND bn_test vlist 45)
add_test(NAME bn_vlist_cmd_cnt_500 COMMAND bn_test vlist 500)
+CMAKEFILES(
+ CMakeLists.txt
+ bntester.dat
+ bn_test.c.in
+ poly_cubic_roots.c
+ poly_quartic_roots.c
+ )
-CMAKEFILES(poly_cubic_roots.c poly_quartic_roots.c)
-CMAKEFILES(bntester.dat)
-CMAKEFILES(CMakeLists.txt)
-
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/libbu/tests/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/libbu/tests/CMakeLists.txt 2020-10-17 14:49:01 UTC (rev
77470)
+++ brlcad/trunk/src/libbu/tests/CMakeLists.txt 2020-10-17 15:12:03 UTC (rev
77471)
@@ -740,19 +740,19 @@
add_subdirectory(dylib)
CMAKEFILES(
- tests_bitv.cmake
- tests_vls.cmake
+ CMakeLists.txt
+ bu_test.c.in
+ dylib/CMakeLists.txt
dylib/README.txt
- dylib/CMakeLists.txt
+ dylib/dylib.c
+ dylib/dylib.h
dylib/plugin_1.cpp
dylib/plugin_2.cpp
- dylib/dylib.c
dylib/run.c
- dylib/dylib.h
+ tests_bitv.cmake
+ tests_vls.cmake
)
-CMAKEFILES(CMakeLists.txt)
-
# Local Variables:
# tab-width: 8
# mode: cmake
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
