Revision: 75556
http://sourceforge.net/p/brlcad/code/75556
Author: starseeker
Date: 2020-04-22 21:48:25 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Getting a /usr/local/include ahead of some of our bundled versions, which is
causing a system header to get found first even with ours enabled. Try getting
more aggressive about sending system includes to the back of the line.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-04-22 21:29:48 UTC
(rev 75555)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-04-22 21:48:25 UTC
(rev 75556)
@@ -568,7 +568,11 @@
function(BRLCAD_SORT_INCLUDE_DIRS DIR_LIST)
if(${DIR_LIST})
set(ORDERED_ELEMENTS "${CMAKE_CURRENT_BINARY_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}" "${BRLCAD_BINARY_DIR}/include"
"${BRLCAD_SOURCE_DIR}/include")
+ set(LAST_ELEMENTS "/usr/local/include" "/usr/include")
+
set(NEW_DIR_LIST "")
+ set(LAST_DIR_LIST "")
+
foreach(element ${ORDERED_ELEMENTS})
set(DEF_EXISTS "-1")
list(FIND ${DIR_LIST} ${element} DEF_EXISTS)
@@ -596,8 +600,19 @@
endif("${SUBPATH_TEST}" STREQUAL "1")
endforeach(inc_path ${${DIR_LIST}})
+ # Pull out include paths that are definitely system paths (and
+ # hence need to come after ours
+ foreach(element ${LAST_ELEMENTS})
+ set(DEF_EXISTS "-1")
+ list(FIND ${DIR_LIST} ${element} DEF_EXISTS)
+ if(NOT "${DEF_EXISTS}" STREQUAL "-1")
+ set(LAST_DIR_LIST ${LAST_DIR_LIST} ${element})
+ list(REMOVE_ITEM ${DIR_LIST} ${element})
+ endif(NOT "${DEF_EXISTS}" STREQUAL "-1")
+ endforeach(element ${LAST_ELEMENTS})
+
# add anything that might be left
- set(NEW_DIR_LIST ${NEW_DIR_LIST} ${${DIR_LIST}})
+ set(NEW_DIR_LIST ${NEW_DIR_LIST} ${${DIR_LIST}} ${LAST_DIR_LIST})
# remove any duplicates
list(REMOVE_DUPLICATES NEW_DIR_LIST)
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
