Revision: 77466
http://sourceforge.net/p/brlcad/code/77466
Author: starseeker
Date: 2020-10-17 01:23:35 +0000 (Sat, 17 Oct 2020)
Log Message:
-----------
Try to work around an issue with the Ninja Multi-Config generator - the
combination of wrapping configure_file and setting source file properties is
causing an issue with the 3.19 release candidate. Don't know if other verisons
have this issue, but for testing see if we can just dodge it - once upstream
resolves this can go away. Reported upstream as Issue 21325.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/libbn/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libbn/tests/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libbu/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/libbu/tests/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/libbn/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbn/CMakeLists.txt 2020-10-16
21:32:51 UTC (rev 77465)
+++ brlcad/branches/thirdparty_rework/src/libbn/CMakeLists.txt 2020-10-17
01:23:35 UTC (rev 77466)
@@ -51,7 +51,7 @@
BRLCAD_ADDLIB(libbn "${LIBBN_SOURCES}" "libbu")
set_target_properties(libbn PROPERTIES VERSION 20.0.1 SOVERSION 20)
-#add_subdirectory(tests)
+add_subdirectory(tests)
CMAKEFILES(
CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/libbn/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbn/tests/CMakeLists.txt
2020-10-16 21:32:51 UTC (rev 77465)
+++ brlcad/branches/thirdparty_rework/src/libbn/tests/CMakeLists.txt
2020-10-17 01:23:35 UTC (rev 77466)
@@ -33,7 +33,10 @@
# Generate bn_test.c file and bnild it
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
+set(SUPPRESS_GENERATED_TAG ON)
configure_file(bn_test.c.in "${CMAKE_CURRENT_BINARY_DIR}/bn_test.c" @ONLY)
+DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/bn_test.c")
+set(SUPPRESS_GENERATED_TAG OFF)
BRLCAD_ADDEXEC(bn_test "${CMAKE_CURRENT_BINARY_DIR}/bn_test.c" libbn TEST)
# Housekeeping for included source files
Modified: brlcad/branches/thirdparty_rework/src/libbu/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbu/CMakeLists.txt 2020-10-16
21:32:51 UTC (rev 77465)
+++ brlcad/branches/thirdparty_rework/src/libbu/CMakeLists.txt 2020-10-17
01:23:35 UTC (rev 77466)
@@ -167,7 +167,7 @@
BRLCAD_ADDDATA(fix.6r vfont)
BRLCAD_ADDDATA(nonie.r.12 vfont)
-#add_subdirectory(tests)
+add_subdirectory(tests)
set(bu_ignore_files
CMakeLists.txt
Modified: brlcad/branches/thirdparty_rework/src/libbu/tests/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/libbu/tests/CMakeLists.txt
2020-10-16 21:32:51 UTC (rev 77465)
+++ brlcad/branches/thirdparty_rework/src/libbu/tests/CMakeLists.txt
2020-10-17 01:23:35 UTC (rev 77466)
@@ -51,7 +51,10 @@
# Generate bu_test.c file and build it
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../..)
+set(SUPPRESS_GENERATED_TAG ON)
configure_file(bu_test.c.in "${CMAKE_CURRENT_BINARY_DIR}/bu_test.c" @ONLY)
+DISTCLEAN("${CMAKE_CURRENT_BINARY_DIR}/bu_test.c")
+set(SUPPRESS_GENERATED_TAG OFF)
BRLCAD_ADDEXEC(bu_test "${CMAKE_CURRENT_BINARY_DIR}/bu_test.c" libbu TEST)
# Housekeeping for included source files
Modified: brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt 2020-10-16
21:32:51 UTC (rev 77465)
+++ brlcad/branches/thirdparty_rework/src/librt/CMakeLists.txt 2020-10-17
01:23:35 UTC (rev 77466)
@@ -389,7 +389,7 @@
#BRLCAD_ADDEXEC(test_root3-subd test_root3-subd.cpp
"librt;libwdb;libbrep;libbu" NO_STRICT NO_INSTALL)
#BRLCAD_ADDEXEC(test_surfacetree test_surfacetree.cpp
"librt;libwdb;libbrep;libbu" NO_STRICT NO_INSTALL)
-#add_subdirectory(tests)
+add_subdirectory(tests)
CMAKEFILES(
CMakeLists.txt
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
