Revision: 77433
http://sourceforge.net/p/brlcad/code/77433
Author: starseeker
Date: 2020-10-15 00:49:39 +0000 (Thu, 15 Oct 2020)
Log Message:
-----------
CMake 3.19rc1 provides a CHECK_COMPILER_FLAG definition - don't define ours if
the more general upstream version is present. (Otherwise it produces a
recursion error.) Once we require 3.19 as a minimum we can just eliminate this
altogether.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/CompilerFlags.cmake
Modified: brlcad/trunk/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/CompilerFlags.cmake 2020-10-14 17:31:05 UTC (rev
77432)
+++ brlcad/trunk/misc/CMake/CompilerFlags.cmake 2020-10-15 00:49:39 UTC (rev
77433)
@@ -160,14 +160,16 @@
# This macro tests for a specified C or C++ compiler flag, setting the
# result in the specified variable.
-macro(CHECK_COMPILER_FLAG FLAG_LANG NEW_FLAG RESULTVAR)
- if("${FLAG_LANG}" STREQUAL "C")
- CHECK_C_COMPILER_FLAG(${NEW_FLAG} ${RESULTVAR})
- endif("${FLAG_LANG}" STREQUAL "C")
- if("${FLAG_LANG}" STREQUAL "CXX")
- CHECK_CXX_COMPILER_FLAG(${NEW_FLAG} ${RESULTVAR})
- endif("${FLAG_LANG}" STREQUAL "CXX")
-endmacro(CHECK_COMPILER_FLAG LANG NEW_FLAG RESULTVAR)
+if(NOT COMMAND CHECK_COMPILER_FLAG)
+ macro(CHECK_COMPILER_FLAG FLAG_LANG NEW_FLAG RESULTVAR)
+ if("${FLAG_LANG}" STREQUAL "C")
+ CHECK_C_COMPILER_FLAG(${NEW_FLAG} ${RESULTVAR})
+ endif("${FLAG_LANG}" STREQUAL "C")
+ if("${FLAG_LANG}" STREQUAL "CXX")
+ CHECK_CXX_COMPILER_FLAG(${NEW_FLAG} ${RESULTVAR})
+ endif("${FLAG_LANG}" STREQUAL "CXX")
+ endmacro(CHECK_COMPILER_FLAG LANG NEW_FLAG RESULTVAR)
+endif(NOT COMMAND CHECK_COMPILER_FLAG)
# Synopsis: CHECK_FLAG(LANG flag [BUILD_TYPES type1 type2 ...] [GROUPS group1
group2 ...] [VARS var1 var2 ...] )
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
