Revision: 75788
          http://sourceforge.net/p/brlcad/code/75788
Author:   starseeker
Date:     2020-05-13 21:18:34 +0000 (Wed, 13 May 2020)
Log Message:
-----------
Make the generation of the embedded_licenses.txt file local to regress/licenses

Modified Paths:
--------------
    brlcad/trunk/doc/legal/embedded/CMakeLists.txt
    brlcad/trunk/regress/licenses/CMakeLists.txt

Modified: brlcad/trunk/doc/legal/embedded/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/CMakeLists.txt      2020-05-13 20:22:42 UTC 
(rev 75787)
+++ brlcad/trunk/doc/legal/embedded/CMakeLists.txt      2020-05-13 21:18:34 UTC 
(rev 75788)
@@ -68,13 +68,6 @@
 
 ADD_DOC(embedded_licenses legal/embedded)
 
-set(llist "${CMAKE_BINARY_DIR}/embedded_licenses.txt")
-file(REMOVE "${llist}")
-foreach(lfile ${embedded_licenses})
-  file(APPEND "${llist}" "${CMAKE_CURRENT_SOURCE_DIR}/${lfile}\n")
-endforeach(lfile ${embedded_licenses})
-DISTCLEAN("${llist}")
-
 CMAKEFILES(CMakeLists.txt)
 
 # Local Variables:

Modified: brlcad/trunk/regress/licenses/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/licenses/CMakeLists.txt        2020-05-13 20:22:42 UTC 
(rev 75787)
+++ brlcad/trunk/regress/licenses/CMakeLists.txt        2020-05-13 21:18:34 UTC 
(rev 75788)
@@ -6,11 +6,19 @@
 endif (O3_COMPILER_FLAG)
 set_target_properties(lcheck PROPERTIES FOLDER "BRL-CAD Regression Tests")
 
+# Get the list of embedded license files from doc/legal/embedded and generate
+# an input file for the regression test
+get_directory_property(ELEGAL DIRECTORY ${CMAKE_SOURCE_DIR}/doc/legal/embedded 
DEFINITION embedded_licenses)
+set(LICENSE_LIST "${CMAKE_CURRENT_BINARY_DIR}/embedded_licenses.txt")
+file(REMOVE "${LICENSE_LIST}")
+foreach(lfile ${ELEGAL})
+  file(APPEND "${LICENSE_LIST}" 
"${CMAKE_SOURCE_DIR}/doc/legal/embedded/${lfile}\n")
+endforeach(lfile ${ELEGAL})
+DISTCLEAN("${LICENSE_LIST}")
 
 set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-licenses.log")
 set(STAMP_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-licenses.done")
 set(ALL_FILES_LIST "${BRLCAD_BINARY_DIR}/cmakefiles.cmake")
-set(LICENSE_LIST "${CMAKE_BINARY_DIR}/embedded_licenses.txt")
 
 add_custom_command(
   OUTPUT "${STAMP_FILE}"

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