Revision: 69932
http://sourceforge.net/p/brlcad/code/69932
Author: starseeker
Date: 2017-06-22 18:15:46 +0000 (Thu, 22 Jun 2017)
Log Message:
-----------
Port in the changes from trunk tcl/tk
Modified Paths:
--------------
brlcad/branches/tcltk86/src/other/tcl/CMakeLists.txt
brlcad/branches/tcltk86/src/other/tk/CMakeLists.txt
Removed Paths:
-------------
brlcad/branches/tcltk86/src/other/tcl/CMake/RPath_Setup.cmake
brlcad/branches/tcltk86/src/other/tk/CMake/RPath_Setup.cmake
Deleted: brlcad/branches/tcltk86/src/other/tcl/CMake/RPath_Setup.cmake
===================================================================
--- brlcad/branches/tcltk86/src/other/tcl/CMake/RPath_Setup.cmake
2017-06-22 18:12:13 UTC (rev 69931)
+++ brlcad/branches/tcltk86/src/other/tcl/CMake/RPath_Setup.cmake
2017-06-22 18:15:46 UTC (rev 69932)
@@ -1,66 +0,0 @@
-# Copyright (c) 2010-2016 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#---------------------------------------------------------------------
-# The following logic is what allows binaries to run successfully in
-# the build directory AND install directory. Thanks to plplot for
-# identifying the necessity of setting CMAKE_INSTALL_NAME_DIR on OSX.
-# Documentation of these options is available at
-# http://www.cmake.org/Wiki/CMake_RPATH_handling
-
-# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# the RPATH/INSTALL_NAME_DIR to be used when installing
-if (NOT APPLE)
- set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}:\$ORIGIN/../${LIB_DIR}")
-endif(NOT APPLE)
-# On OSX, we need to set INSTALL_NAME_DIR instead of RPATH for CMake < 3.0
-#
http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR
-# http://www.cmake.org/cmake/help/v3.2/policy/CMP0042.html
-if ("${CMAKE_VERSION}" VERSION_LESS 3.0)
- set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
-endif ("${CMAKE_VERSION}" VERSION_LESS 3.0)
-
-# add the automatically determined parts of the RPATH which point to
-# directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/tcltk86/src/other/tcl/CMakeLists.txt
===================================================================
--- brlcad/branches/tcltk86/src/other/tcl/CMakeLists.txt 2017-06-22
18:12:13 UTC (rev 69931)
+++ brlcad/branches/tcltk86/src/other/tcl/CMakeLists.txt 2017-06-22
18:15:46 UTC (rev 69932)
@@ -85,7 +85,16 @@
# directory AND install directory. Documentation of these options is available
# at http://www.cmake.org/Wiki/CMake_RPATH_handling
-include("${TCL_CMAKE_DIR}/RPath_Setup.cmake")
+if(EXISTS "${TCL_CMAKE_DIR}/RPath_Setup.cmake")
+ include("${TCL_CMAKE_DIR}/RPath_Setup.cmake")
+ if(COMMAND cmake_set_rpath)
+ cmake_set_rpath()
+ endif(COMMAND cmake_set_rpath)
+else(EXISTS "${TCL_CMAKE_DIR}/RPath_Setup.cmake")
+ if(NOT HAVE_PARENT_BUILD)
+ message(FATAL_ERROR "Not building as a subbuild, but
${TCL_CMAKE_DIR}/RPath_Setup.cmake not found. To build as a stand-alone build,
add RPath_Setup.cmake to the CMake directory.")
+ endif(NOT HAVE_PARENT_BUILD)
+endif(EXISTS "${TCL_CMAKE_DIR}/RPath_Setup.cmake")
#---------------------------------------------------------------------
# Define relative install locations and output directories. Don't set
Deleted: brlcad/branches/tcltk86/src/other/tk/CMake/RPath_Setup.cmake
===================================================================
--- brlcad/branches/tcltk86/src/other/tk/CMake/RPath_Setup.cmake
2017-06-22 18:12:13 UTC (rev 69931)
+++ brlcad/branches/tcltk86/src/other/tk/CMake/RPath_Setup.cmake
2017-06-22 18:15:46 UTC (rev 69932)
@@ -1,66 +0,0 @@
-# Copyright (c) 2010-2016 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#---------------------------------------------------------------------
-# The following logic is what allows binaries to run successfully in
-# the build directory AND install directory. Thanks to plplot for
-# identifying the necessity of setting CMAKE_INSTALL_NAME_DIR on OSX.
-# Documentation of these options is available at
-# http://www.cmake.org/Wiki/CMake_RPATH_handling
-
-# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH FALSE)
-
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-
-# the RPATH/INSTALL_NAME_DIR to be used when installing
-if (NOT APPLE)
- set(CMAKE_INSTALL_RPATH
"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}:\$ORIGIN/../${LIB_DIR}")
-endif(NOT APPLE)
-# On OSX, we need to set INSTALL_NAME_DIR instead of RPATH for CMake < 3.0
-#
http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR
-# http://www.cmake.org/cmake/help/v3.2/policy/CMP0042.html
-if ("${CMAKE_VERSION}" VERSION_LESS 3.0)
- set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
-endif ("${CMAKE_VERSION}" VERSION_LESS 3.0)
-
-# add the automatically determined parts of the RPATH which point to
-# directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
-# Local Variables:
-# tab-width: 8
-# mode: cmake
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=2 tabstop=8
Modified: brlcad/branches/tcltk86/src/other/tk/CMakeLists.txt
===================================================================
--- brlcad/branches/tcltk86/src/other/tk/CMakeLists.txt 2017-06-22 18:12:13 UTC
(rev 69931)
+++ brlcad/branches/tcltk86/src/other/tk/CMakeLists.txt 2017-06-22 18:15:46 UTC
(rev 69932)
@@ -85,7 +85,16 @@
# directory AND install directory. Documentation of these options is available
# at http://www.cmake.org/Wiki/CMake_RPATH_handling
-include("${TK_CMAKE_DIR}/RPath_Setup.cmake")
+if(EXISTS "${TK_CMAKE_DIR}/RPath_Setup.cmake")
+ include("${TK_CMAKE_DIR}/RPath_Setup.cmake")
+ if(COMMAND cmake_set_rpath)
+ cmake_set_rpath()
+ endif(COMMAND cmake_set_rpath)
+else(EXISTS "${TK_CMAKE_DIR}/RPath_Setup.cmake")
+ if(NOT HAVE_PARENT_BUILD)
+ message(FATAL_ERROR "Not building as a subbuild, but
${TK_CMAKE_DIR}/RPath_Setup.cmake not found. To build as a stand-alone build,
add RPath_Setup.cmake to the CMake directory.")
+ endif(NOT HAVE_PARENT_BUILD)
+endif(EXISTS "${TK_CMAKE_DIR}/RPath_Setup.cmake")
#---------------------------------------------------------------------
# Define relative install locations and output directories. Don't set
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
