Revision: 77411
http://sourceforge.net/p/brlcad/code/77411
Author: starseeker
Date: 2020-10-13 17:22:33 +0000 (Tue, 13 Oct 2020)
Log Message:
-----------
Adjust include dirs and the management of -isystem.
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
brlcad/branches/thirdparty_rework/misc/CMake/FindSTEPCODE.cmake
brlcad/branches/thirdparty_rework/src/conv/step/step-g/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
Removed Paths:
-------------
brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
Modified: brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/misc/CMake/BRLCAD_Targets.cmake
2020-10-13 17:22:33 UTC (rev 77411)
@@ -645,24 +645,21 @@
if (NOT IS_LOCAL)
IS_SUBPATH("${BRLCAD_BINARY_DIR}" "${abs_inc_dir}" IS_LOCAL)
endif (NOT IS_LOCAL)
- if("${inc_dir}" MATCHES "other" OR NOT IS_LOCAL)
- # Unfortunately, a bug in the CMake SYSTEM option to
- # include_directories requires that these variables
- # be explicitly set on OSX until we can require CMake
- # version 3.6 - see
- # https://public.kitware.com/Bug/view.php?id=15953
- if(APPLE)
- set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
- set(CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem ")
- endif(APPLE)
- if("${inc_dir}" MATCHES "other")
+ set(IS_SYSPATH 0)
+ foreach(sp ${SYS_INCLUDE_PATTERNS})
+ if("${inc_dir}" MATCHES "${sp}")
+ set(IS_SYSPATH 1)
+ endif("${inc_dir}" MATCHES "${sp}")
+ endforeach(sp ${SYS_INCLUDE_PATTERNS})
+ if(IS_SYSPATH OR NOT IS_LOCAL)
+ if(IS_SYSPATH)
include_directories(SYSTEM ${inc_dir})
- else("${inc_dir}" MATCHES "other")
+ else(IS_SYSPATH)
include_directories(AFTER SYSTEM ${inc_dir})
- endif("${inc_dir}" MATCHES "other")
- else("${inc_dir}" MATCHES "other" OR NOT IS_LOCAL)
+ endif(IS_SYSPATH)
+ else(IS_SYSPATH OR NOT IS_LOCAL)
include_directories(BEFORE ${inc_dir})
- endif("${inc_dir}" MATCHES "other" OR NOT IS_LOCAL)
+ endif(IS_SYSPATH OR NOT IS_LOCAL)
endforeach(inc_dir ${ALL_INCLUDES})
endfunction(BRLCAD_INCLUDE_DIRS DIR_LIST)
Modified: brlcad/branches/thirdparty_rework/misc/CMake/FindSTEPCODE.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/misc/CMake/FindSTEPCODE.cmake
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/misc/CMake/FindSTEPCODE.cmake
2020-10-13 17:22:33 UTC (rev 77411)
@@ -138,14 +138,12 @@
if (STEPCODE_FOUND)
set(STEPCODE_INCLUDE_DIRS
+ ${STEPCODE_INCLUDE_DIR}
${STEPCODE_BASE_DIR}
- ${STEPCODE_DAI_DIR}
+ ${STEPCODE_STEPCORE_DIR}
${STEPCODE_EDITOR_DIR}
- ${STEPCODE_STEPCORE_DIR}
${STEPCODE_UTILS_DIR}
- ${STEPCODE_EXPPP_DIR}
- ${STEPCODE_EXPRESS_DIR}
- ${STEPCODE_INCLUDE_DIR}
+ ${STEPCODE_DAI_DIR}
)
set(STEPCODE_LIBRARIES
${STEPCODE_BASE_LIBRARY}
Modified: brlcad/branches/thirdparty_rework/src/conv/step/step-g/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/conv/step/step-g/CMakeLists.txt
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/conv/step/step-g/CMakeLists.txt
2020-10-13 17:22:33 UTC (rev 77411)
@@ -1,8 +1,8 @@
set(AP203_INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
+ ${OPENNURBS_INCLUDE_DIR}
${STEPCODE_INCLUDE_DIRS}
- ${OPENNURBS_INCLUDE_DIRS}
)
BRLCAD_INCLUDE_DIRS(AP203_INCLUDE_DIRS)
Modified: brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-13
15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/other/CMakeLists.txt 2020-10-13
17:22:33 UTC (rev 77411)
@@ -160,6 +160,7 @@
# Eigen is header only
include("${CMAKE_CURRENT_SOURCE_DIR}/Eigen.dist")
CMAKEFILES_IN_DIR(Eigen_ignore_files Eigen)
+set(SYS_INCLUDE_PATTERNS ${SYS_INCLUDE_PATTERNS} Eigen CACHE STRING "Bundled
system include dirs" FORCE)
if (BRLCAD_ENABLE_TCL AND BRLCAD_ENABLE_TK)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/superbuild/CMakeLists.txt
2020-10-13 17:22:33 UTC (rev 77411)
@@ -55,6 +55,11 @@
# and mess up the results...
set(CMAKE_SYSTEM_IGNORE_PATH "${CMAKE_INSTALL_PREFIX}")
+
+# We will build up a list of all include dirs coming from 3rd party
+# projects, so we can include them with -isystem
+unset(SYS_INCLUDE_PATTERNS CACHE)
+
#---------------------------------------------------------------------
# Define relative install locations and output directories. Don't set
# these if they have already been set by some other means (like a
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-13
15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-13
17:22:33 UTC (rev 77411)
@@ -156,6 +156,7 @@
NOINSTALL
cpl_config.h
)
+ set(SYS_INCLUDE_PATTERNS ${SYS_INCLUDE_PATTERNS} gdal CACHE STRING "Bundled
system include dirs" FORCE)
set(GDAL_LIBRARY gdal CACHE STRING "Building bundled gdal" FORCE)
set(GDAL_LIBRARIES gdal CACHE STRING "Building bundled gdal" FORCE)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-13 17:22:33 UTC (rev 77411)
@@ -47,6 +47,7 @@
ppmfloyd.h
pm_config.h
)
+ set(SYS_INCLUDE_PATTERNS ${SYS_INCLUDE_PATTERNS} netpbm CACHE STRING
"Bundled system include dirs" FORCE)
set(NETPBM_LIBRARY netpbm CACHE STRING "Building bundled netpbm" FORCE)
set(NETPBM_LIBRARIES netpbm CACHE STRING "Building bundled netpbm" FORCE)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-13 17:22:33 UTC (rev 77411)
@@ -62,6 +62,7 @@
proj_api.h
geodesic.h
)
+ set(SYS_INCLUDE_PATTERNS ${SYS_INCLUDE_PATTERNS} proj CACHE STRING "Bundled
system include dirs" FORCE)
set(PROJ4_LIBRARIES proj CACHE STRING "Building bundled proj" FORCE)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-13 17:22:33 UTC (rev 77411)
@@ -146,6 +146,7 @@
clstepcore/Registry.h
clstepcore/complexSupport.h
)
+ set(SYS_INCLUDE_PATTERNS ${SYS_INCLUDE_PATTERNS} stepcode CACHE STRING
"Bundled system include dirs" FORCE)
set(STEPCODE_BASE_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/base CACHE STRING
"Building bundled STEPCODE" FORCE)
set(STEPCODE_DAI_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/cldai CACHE STRING
"Building bundled STEPCODE" FORCE)
@@ -168,14 +169,12 @@
set(EXPPP_EXECUTABLE exppp_exe CACHE STRING "Building bundled STEPCODE"
FORCE)
set(STEPCODE_INCLUDE_DIRS
+ ${STEPCODE_DIR}
${STEPCODE_BASE_DIR}
- ${STEPCODE_DAI_DIR}
+ ${STEPCODE_STEPCORE_DIR}
${STEPCODE_EDITOR_DIR}
- ${STEPCODE_STEPCORE_DIR}
${STEPCODE_UTILS_DIR}
- ${STEPCODE_EXPPP_DIR}
- ${STEPCODE_EXPRESS_DIR}
- ${STEPCODE_DIR}
+ ${STEPCODE_DAI_DIR}
CACHE STRING "Directories containing STEPCODE headers." FORCE)
set(STEPCODE_LIBRARIES
Deleted: brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
2020-10-13 15:30:02 UTC (rev 77410)
+++ brlcad/branches/thirdparty_rework/src/superbuild/utahrle.cmake
2020-10-13 17:22:33 UTC (rev 77411)
@@ -1,67 +0,0 @@
-set(utahrle_DESCRIPTION "
-Option for enabling and disabling compilation of the Utah Raster
-Toolkit library provided with BRL-CAD's source code. Default is AUTO,
-responsive to the toplevel BRLCAD_BUNDLED_LIBS option and testing
-first for a system version if BRLCAD_BUNDLED_LIBS is also AUTO.
-")
-THIRD_PARTY(libutahrle UTAHRLE utahrle utahrle_DESCRIPTION REQUIRED_VARS
BRLCAD_LEVEL3 ALIASES ENABLE_UTAHRLE FLAGS NOSYS)
-
-if (BRLCAD_UTAHRLE_BUILD)
-
- set(UTAHRLE_MAJOR_VERSION 19)
- set(UTAHRLE_MINOR_VERSION 0)
- set(UTAHRLE_PATCH_VERSION 1)
- set(UTAHRLE_VERSION
${UTAHRLE_MAJOR_VERSION}.${UTAHRLE_MINOR_VERSION}.${UTAHRLE_PATCH_VERSION})
-
- if (MSVC)
- set(UTAHRLE_BASENAME utahrle)
- set(UTAHRLE_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX})
- else (MSVC)
- set(UTAHRLE_BASENAME libutahrle)
- set(UTAHRLE_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${UTAHRLE_VERSION})
- endif (MSVC)
-
-
- ExternalProject_Add(UTAHRLE_BLD
- SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../other/libutahrle"
- BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
- CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DLIB_DIR=${LIB_DIR} -DBIN_DIR=${BIN_DIR}
- -DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- )
-
- # Tell the parent build about files and libraries
- file(APPEND "${SUPERBUILD_OUT}" "
- ExternalProject_Target(utahrle UTAHRLE_BLD
- OUTPUT_FILE ${UTAHRLE_BASENAME}${UTAHRLE_SUFFIX}
- STATIC_OUTPUT_FILE ${UTAHRLE_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}
- SYMLINKS
\"${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX};${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}.${UTAHRLE_MAJOR_VERSION}\"
- LINK_TARGET \"${UTAHRLE_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}\"
- STATIC_LINK_TARGET \"${UTAHRLE_BASENAME}${CMAKE_STATIC_LIBRARY_SUFFIX}\"
- RPATH
- )
- ExternalProject_ByProducts(UTAHRLE_BLD ${INCLUDE_DIR}
- rle.h
- rle_code.h
- rle_config.h
- rle_put.h
- rle_raw.h
- )
- \n")
-
- list(APPEND BRLCAD_DEPS UTAHRLE_BLD)
-
- set(UTAHRLE_LIBRARIES utahrle CACHE STRING "Building bundled libutahrle"
FORCE)
- set(UTAHRLE_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INCLUDE_DIR}" CACHE
STRING "Directory containing utahrle headers." FORCE)
-
- SetTargetFolder(UTAHRLE_BLD "Third Party Libraries")
- SetTargetFolder(utahrle "Third Party Libraries")
-
-endif (BRLCAD_UTAHRLE_BUILD)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
-
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
