Revision: 77560
http://sourceforge.net/p/brlcad/code/77560
Author: starseeker
Date: 2020-10-22 22:56:13 +0000 (Thu, 22 Oct 2020)
Log Message:
-----------
Fix distcheck, separate out usr/local include.
Modified Paths:
--------------
brlcad/branches/extbuild/CMakeLists.txt
brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
brlcad/branches/extbuild/misc/CMake/CMakeLists.txt
Modified: brlcad/branches/extbuild/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/CMakeLists.txt 2020-10-22 22:51:32 UTC (rev
77559)
+++ brlcad/branches/extbuild/CMakeLists.txt 2020-10-22 22:56:13 UTC (rev
77560)
@@ -192,6 +192,16 @@
endif(CMAKE_CONFIGURATION_TYPES)
#---------------------------------------------------------------------
+# We want to check /usr/local by default, so add it if it exists
+if (IS_DIRECTORY /usr/local)
+ 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)
+
+#---------------------------------------------------------------------
# Intricacies involved with setting the install path mostly revolve
# around build type dependent install directories. Also needs the
# current version defined.
Modified: brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
===================================================================
--- brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
2020-10-22 22:51:32 UTC (rev 77559)
+++ brlcad/branches/extbuild/misc/CMake/BRLCAD_Install_Prefix.cmake
2020-10-22 22:56:13 UTC (rev 77560)
@@ -63,16 +63,6 @@
#---------------------------------------------------------------------
-# We want to check /usr/local by default, so add it if it exists
-if (IS_DIRECTORY /usr/local)
- 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)
-
-#---------------------------------------------------------------------
# The location in which to install BRL-CAD. Only do this if
# CMAKE_INSTALL_PREFIX hasn't been set already, to try and allow
# parent builds (if any) some control.
Modified: brlcad/branches/extbuild/misc/CMake/CMakeLists.txt
===================================================================
--- brlcad/branches/extbuild/misc/CMake/CMakeLists.txt 2020-10-22 22:51:32 UTC
(rev 77559)
+++ brlcad/branches/extbuild/misc/CMake/CMakeLists.txt 2020-10-22 22:56:13 UTC
(rev 77560)
@@ -4,6 +4,7 @@
BRLCAD_CPackOptions.cmake.in
BRLCAD_CheckFunctions.cmake
BRLCAD_Environment_Setup.cmake
+ BRLCAD_Install_Prefix.cmake
BRLCAD_Options.cmake
BRLCAD_Regress_Util.cmake
BRLCAD_Summary.cmake
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
