Revision: 75823
http://sourceforge.net/p/brlcad/code/75823
Author: starseeker
Date: 2020-05-15 15:16:47 +0000 (Fri, 15 May 2020)
Log Message:
-----------
Merge changes from trunk through r75822
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/regress/licenses/CMakeLists.txt
brlcad/branches/dm-fb-merge/regress/licenses/regress-licenses.cmake
brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
brlcad/branches/dm-fb-merge/regress/repository/repocheck.cpp
Property Changed:
----------------
brlcad/branches/dm-fb-merge/
brlcad/branches/dm-fb-merge/regress/
Index: brlcad/branches/dm-fb-merge
===================================================================
--- brlcad/branches/dm-fb-merge 2020-05-15 15:11:46 UTC (rev 75822)
+++ brlcad/branches/dm-fb-merge 2020-05-15 15:16:47 UTC (rev 75823)
Property changes on: brlcad/branches/dm-fb-merge
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:75440-75814
\ No newline at end of property
+/brlcad/trunk:75440-75822
\ No newline at end of property
Index: brlcad/branches/dm-fb-merge/regress
===================================================================
--- brlcad/branches/dm-fb-merge/regress 2020-05-15 15:11:46 UTC (rev 75822)
+++ brlcad/branches/dm-fb-merge/regress 2020-05-15 15:16:47 UTC (rev 75823)
Property changes on: brlcad/branches/dm-fb-merge/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
/brlcad/branches/tcltk86/regress:68300-75257
-/brlcad/trunk/regress:75512-75597,75630-75814
\ No newline at end of property
+/brlcad/trunk/regress:75512-75597,75630-75822
\ No newline at end of property
Modified: brlcad/branches/dm-fb-merge/regress/licenses/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/regress/licenses/CMakeLists.txt 2020-05-15
15:11:46 UTC (rev 75822)
+++ brlcad/branches/dm-fb-merge/regress/licenses/CMakeLists.txt 2020-05-15
15:16:47 UTC (rev 75823)
@@ -1,3 +1,8 @@
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ )
+
add_executable(lcheck licenses_check.cpp)
if (O3_COMPILER_FLAG)
# This check benefits greatly from optimization. If we have the O3 flag, use
@@ -16,38 +21,26 @@
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")
-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}"
-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} ${LICENSE_LIST})
-set_target_properties(regress-licenses PROPERTIES FOLDER "BRL-CAD Regression
Tests")
-add_dependencies(regress regress-licenses)
-add_dependencies(check regress-licenses)
-
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} -DL_LIST=${LICENSE_LIST}
-DF_LIST=${ALL_FILES_LIST}
- -DW_DIR=${CMAKE_CURRENT_BINARY_DIR}
+ -DL_LIST=${LICENSE_LIST} -DF_LIST=${ALL_FILES_LIST}
-P "${CMAKE_CURRENT_SOURCE_DIR}/regress-licenses.cmake"
)
set_tests_properties(regress-licenses PROPERTIES LABELS "Regression")
-DISTCLEAN(
- ${STAMP_FILE}
- ${LOG_FILE}
- )
-
+if (CMAKE_CONFIGURATION_TYPES)
+ add_custom_target(regress-licenses COMMAND ${CMAKE_CTEST_COMMAND} -C
${CMAKE_CFG_INTDIR} -R ^regress-licenses --output-on-failure)
+else (CMAKE_CONFIGURATION_TYPES)
+ add_custom_target(regress-licenses COMMAND ${CMAKE_CTEST_COMMAND} -R
^regress-licenses --output-on-failure)
+endif (CMAKE_CONFIGURATION_TYPES)
+add_dependencies(regress-licenses repocheck)
+set_target_properties(regress-licenses PROPERTIES FOLDER "BRL-CAD Regression
Tests")
set_target_properties(regress-licenses PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+add_dependencies(regress regress-licenses)
+add_dependencies(check regress-licenses)
CMAKEFILES(
CMakeLists.txt
Modified: brlcad/branches/dm-fb-merge/regress/licenses/regress-licenses.cmake
===================================================================
--- brlcad/branches/dm-fb-merge/regress/licenses/regress-licenses.cmake
2020-05-15 15:11:46 UTC (rev 75822)
+++ brlcad/branches/dm-fb-merge/regress/licenses/regress-licenses.cmake
2020-05-15 15:16:47 UTC (rev 75823)
@@ -1,27 +1,19 @@
string(REPLACE "\\" "" LICENSE_CHECK_EXEC "${LCHECK_EXEC}")
-string(REPLACE "\\" "" WORKING_DIR "${W_DIR}")
string(REPLACE "\\" "" FILES_LIST "${F_LIST}")
string(REPLACE "\\" "" LICENSE_FILE_SET "${L_LIST}")
-string(REPLACE "\\" "" LOG_FILE "${L_FILE}")
-string(REPLACE "\\" "" STAMP_FILE "${S_FILE}")
string(REPLACE "\\" "" B_SOURCE_DIR "${BRLCAD_SOURCE_DIR}")
-file(WRITE "${LOG_FILE}" "Running license check:\n${LICENSE_CHECK_EXEC}
${LICENSE_FILE_SET} ${FILES_LIST}\n")
+message("Running license check:\n${LICENSE_CHECK_EXEC} ${LICENSE_FILE_SET}
${FILES_LIST}\n")
message("Processing...")
execute_process(
COMMAND "${LICENSE_CHECK_EXEC}" "${LICENSE_FILE_SET}" "${FILES_LIST}"
"${B_SOURCE_DIR}" RESULT_VARIABLE license_result
OUTPUT_VARIABLE license_log ERROR_VARIABLE license_log
- WORKING_DIRECTORY ${WORKING_DIR}
)
message("Processing... done.")
-file(APPEND "${LOG_FILE}" "\n${license_log}\n")
-
if(license_result)
- file(APPEND "${LOG_FILE}" "\n\nError: return code ${license_result}")
- message(FATAL_ERROR "[license check] Failure, see ${LOG_FILE} for more
info.\n")
-else(license_result)
- execute_process(COMMAND "${CMAKE_COMMAND}" -E touch "${STAMP_FILE}")
+ message("${license_log}\n")
+ message(FATAL_ERROR "[license check] failed.\n")
endif(license_result)
# Local Variables:
Modified: brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
2020-05-15 15:11:46 UTC (rev 75822)
+++ brlcad/branches/dm-fb-merge/regress/repository/CMakeLists.txt
2020-05-15 15:16:47 UTC (rev 75823)
@@ -1,3 +1,8 @@
+include_directories(
+ ${BRLCAD_BINARY_DIR}/include
+ ${BRLCAD_SOURCE_DIR}/include
+ )
+
add_executable(repocheck repocheck.cpp)
target_link_libraries(repocheck libbu ${CMAKE_THREAD_LIBS_INIT})
if (O3_COMPILER_FLAG)
@@ -18,7 +23,11 @@
)
set_tests_properties(regress-repository PROPERTIES LABELS "Regression")
-add_custom_target(regress-repository COMMAND ${CMAKE_CTEST_COMMAND} -R
^regress-repository --output-on-failure)
+if (CMAKE_CONFIGURATION_TYPES)
+ add_custom_target(regress-repository COMMAND ${CMAKE_CTEST_COMMAND} -C
${CMAKE_CFG_INTDIR} -R ^regress-repository --output-on-failure)
+else (CMAKE_CONFIGURATION_TYPES)
+ add_custom_target(regress-repository COMMAND ${CMAKE_CTEST_COMMAND} -R
^regress-repository --output-on-failure)
+endif (CMAKE_CONFIGURATION_TYPES)
add_dependencies(regress-repository repocheck)
set_target_properties(regress-repository PROPERTIES FOLDER "BRL-CAD Regression
Tests")
set_target_properties(regress-repository PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD
1)
Modified: brlcad/branches/dm-fb-merge/regress/repository/repocheck.cpp
===================================================================
--- brlcad/branches/dm-fb-merge/regress/repository/repocheck.cpp
2020-05-15 15:11:46 UTC (rev 75822)
+++ brlcad/branches/dm-fb-merge/regress/repository/repocheck.cpp
2020-05-15 15:16:47 UTC (rev 75823)
@@ -41,6 +41,7 @@
#include "common.h"
+#include <cctype>
#include <cstdio>
#include <algorithm>
#include <locale>
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
