Revision: 75699
http://sourceforge.net/p/brlcad/code/75699
Author: starseeker
Date: 2020-05-05 19:04:07 +0000 (Tue, 05 May 2020)
Log Message:
-----------
Don't file(GLOB) the license list - generate a specific input file with the
CMake set of defined licenses. Should avoid treating any garbage files in the
license directory as licenses.
Modified Paths:
--------------
brlcad/trunk/doc/legal/embedded/CMakeLists.txt
brlcad/trunk/regress/licenses/CMakeLists.txt
brlcad/trunk/regress/licenses/regress-licenses.cmake
Modified: brlcad/trunk/doc/legal/embedded/CMakeLists.txt
===================================================================
--- brlcad/trunk/doc/legal/embedded/CMakeLists.txt 2020-05-05 18:42:35 UTC
(rev 75698)
+++ brlcad/trunk/doc/legal/embedded/CMakeLists.txt 2020-05-05 19:04:07 UTC
(rev 75699)
@@ -1,5 +1,6 @@
set(embedded_licenses
apple.txt
+ art.txt
ayam.txt
b64.txt
bullet.txt
@@ -67,6 +68,13 @@
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-05 18:42:35 UTC
(rev 75698)
+++ brlcad/trunk/regress/licenses/CMakeLists.txt 2020-05-05 19:04:07 UTC
(rev 75699)
@@ -10,16 +10,17 @@
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}"
COMMAND "${CMAKE_COMMAND}"
-DLCHECK_EXEC="$<TARGET_FILE:lcheck>"
-DBRLCAD_SOURCE_DIR="${BRLCAD_SOURCE_DIR}"
- -DL_FILE="${LOG_FILE}" -DS_FILE="${STAMP_FILE}"
-DF_LIST="${ALL_FILES_LIST}"
+ -DL_FILE="${LOG_FILE}" -DS_FILE="${STAMP_FILE}"
-DL_LIST="${LICENSE_LIST}" -DF_LIST="${ALL_FILES_LIST}"
-DW_DIR="${CMAKE_CURRENT_BINARY_DIR}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/regress-licenses.cmake"
)
-add_custom_target(regress-licenses DEPENDS ${STAMP_FILE})
+add_custom_target(regress-licenses DEPENDS ${STAMP_FILE}
${CMAKE_BINARY_DIR}/embedded_licenses.txt)
set_target_properties(regress-licenses PROPERTIES FOLDER "BRL-CAD Regression
Tests")
add_dependencies(regress regress-licenses)
add_dependencies(check regress-licenses)
@@ -27,7 +28,7 @@
add_test(NAME regress-licenses
COMMAND "${CMAKE_COMMAND}"
-DLCHECK_EXEC=$<TARGET_FILE:lcheck>
-DBRLCAD_SOURCE_DIR=${BRLCAD_SOURCE_DIR}
- -DL_FILE=${LOG_FILE} -DS_FILE=${STAMP_FILE}
-DF_LIST=${ALL_FILES_LIST}
+ -DL_FILE=${LOG_FILE} -DS_FILE=${STAMP_FILE} -DL_LIST=${LICENSE_LIST}
-DF_LIST=${ALL_FILES_LIST}
-DW_DIR=${CMAKE_CURRENT_BINARY_DIR}
-P "${CMAKE_CURRENT_SOURCE_DIR}/regress-licenses.cmake"
)
Modified: brlcad/trunk/regress/licenses/regress-licenses.cmake
===================================================================
--- brlcad/trunk/regress/licenses/regress-licenses.cmake 2020-05-05
18:42:35 UTC (rev 75698)
+++ brlcad/trunk/regress/licenses/regress-licenses.cmake 2020-05-05
19:04:07 UTC (rev 75699)
@@ -1,22 +1,10 @@
set(LICENSE_CHECK_EXEC "${LCHECK_EXEC}")
-set(LICENSES_DIR "${BRLCAD_SOURCE_DIR}/doc/legal/embedded")
set(WORKING_DIR "${W_DIR}")
set(FILES_LIST "${F_LIST}")
+set(LICENSE_FILE_SET "${L_LIST}")
set(LOG_FILE "${L_FILE}")
set(STAMP_FILE "${S_FILE}")
-message("Identifying third party license files...")
-file(GLOB_RECURSE LICENSE_FILES "${LICENSES_DIR}/*")
-
-set(LICENSE_FILE_SET "${WORKING_DIR}/license_files.txt")
-file(WRITE "${LICENSE_FILE_SET}" "")
-foreach(LFILE ${LICENSE_FILES})
- if (NOT "${LFILE}" MATCHES "CMakeLists.txt")
- file(APPEND "${LICENSE_FILE_SET}" "${LFILE}\n")
- endif (NOT "${LFILE}" MATCHES "CMakeLists.txt")
-endforeach(LFILE ${LICENSE_FILES})
-message("Identifying third party license files... done.")
-
file(WRITE "${LOG_FILE}" "Running license check:\n${LICENSE_CHECK_EXEC}
${LICENSE_FILE_SET} ${FILES_LIST}\n")
message("Processing...")
execute_process(
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
