Revision: 75558
http://sourceforge.net/p/brlcad/code/75558
Author: starseeker
Date: 2020-04-22 22:58:48 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Doing include_directories at the top level looks like it was a bad idea...
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2020-04-22 22:03:53 UTC (rev 75557)
+++ brlcad/trunk/CMakeLists.txt 2020-04-22 22:58:48 UTC (rev 75558)
@@ -754,7 +754,6 @@
set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/local)
if (IS_DIRECTORY /usr/local/include)
set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include)
- include_directories(AFTER SYSTEM /usr/local/include)
endif (IS_DIRECTORY /usr/local/include)
endif (IS_DIRECTORY /usr/local)
Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-04-22 22:03:53 UTC
(rev 75557)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake 2020-04-22 22:58:48 UTC
(rev 75558)
@@ -628,6 +628,14 @@
# sort function.
function(BRLCAD_INCLUDE_DIRS DIR_LIST)
+ # TODO - We don't want parent directories values augmenting DIR_LIST for
+ # subsequent targets - if we're calling this, we're taking full control of
+ # all inclusions for all targets in this and subsequent directories. We
+ # should probably use the target level INCLUDE_DIRECTORIES property and
+ # stop setting include_directories on entire directories all together
+ # for maximal precision and minimum surprises...
+ #set_property(DIRECTORY PROPERTY INCLUDE_DIRECTORIES "")
+
set(INCLUDE_DIRS ${${DIR_LIST}})
if(INCLUDE_DIRS)
list(REMOVE_DUPLICATES INCLUDE_DIRS)
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
