Revision: 75374
http://sourceforge.net/p/brlcad/code/75374
Author: starseeker
Date: 2020-04-13 13:28:43 +0000 (Mon, 13 Apr 2020)
Log Message:
-----------
Cherrypick r74981 - support for newer CMake message types
Modified Paths:
--------------
brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-04-13 13:27:10 UTC (rev 75373)
+++ brlcad/branches/RELEASE 2020-04-13 13:28:43 UTC (rev 75374)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,75056,75325
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,74981,75056,75325
\ No newline at end of property
Modified: brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake
===================================================================
--- brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake 2020-04-13
13:27:10 UTC (rev 75373)
+++ brlcad/branches/RELEASE/misc/CMake/BRLCAD_Util.cmake 2020-04-13
13:28:43 UTC (rev 75374)
@@ -85,14 +85,14 @@
# optional arg, so we extract it and test.
list(GET ARGV 0 MessageType)
- if (MessageType STREQUAL FATAL_ERROR OR MessageType STREQUAL SEND_ERROR OR
MessageType STREQUAL WARNING OR MessageType STREQUAL AUTHOR_WARNING OR
MessageType STREQUAL STATUS)
+ if (MessageType STREQUAL FATAL_ERROR OR MessageType STREQUAL SEND_ERROR OR
MessageType STREQUAL WARNING OR MessageType STREQUAL AUTHOR_WARNING OR
MessageType STREQUAL STATUS OR MessageType STREQUAL CHECK_START OR MessageType
STREQUAL CHECK_PASS OR MessageType STREQUAL CHECK_FAIL )
list(REMOVE_AT ARGV 0)
_message(${MessageType} "${ARGV}")
file(APPEND "${BRLCAD_BINARY_DIR}/CMakeFiles/CMakeOutput.log"
"${MessageType}: ${ARGV}\n")
- else (MessageType STREQUAL FATAL_ERROR OR MessageType STREQUAL SEND_ERROR OR
MessageType STREQUAL WARNING OR MessageType STREQUAL AUTHOR_WARNING OR
MessageType STREQUAL STATUS)
+ else ()
_message("${ARGV}")
file(APPEND "${BRLCAD_BINARY_DIR}/CMakeFiles/CMakeOutput.log" "${ARGV}\n")
- endif (MessageType STREQUAL FATAL_ERROR OR MessageType STREQUAL SEND_ERROR
OR MessageType STREQUAL WARNING OR MessageType STREQUAL AUTHOR_WARNING OR
MessageType STREQUAL STATUS)
+ endif ()
# ~10% slower alternative that avoids adding '--' to STATUS messages
# execute_process(COMMAND ${CMAKE_COMMAND} -E echo "${ARGV}")
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
