Revision: 77872
http://sourceforge.net/p/brlcad/code/77872
Author: starseeker
Date: 2020-12-02 16:31:33 +0000 (Wed, 02 Dec 2020)
Log Message:
-----------
Don't override if these settings are set explicitly from the command line
Modified Paths:
--------------
brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Build_opts.cmake
Modified:
brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Build_opts.cmake
===================================================================
--- brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Build_opts.cmake
2020-12-02 16:24:54 UTC (rev 77871)
+++ brlcad/branches/extbuild/src/other/ext/stepcode/cmake/SC_Build_opts.cmake
2020-12-02 16:31:33 UTC (rev 77872)
@@ -103,23 +103,33 @@
# 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)
+if(NOT DEFINED CMAKE_SKIP_BUILD_RPATH)
+ set(CMAKE_SKIP_BUILD_RPATH FALSE)
+endif()
# when building, don't use the install RPATH already
# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+if(NOT DEFINED CMAKE_BUILD_WITH_INSTALL_RPATH)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+endif()
# the RPATH/INSTALL_NAME_DIR to be used when installing
if (NOT APPLE)
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
+ if(NOT DEFINED CMAKE_INSTALL_RPATH)
+ set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib:\$ORIGIN/../lib")
+ endif()
endif(NOT APPLE)
# On OSX, we need to set INSTALL_NAME_DIR instead of RPATH
#
http://www.cmake.org/cmake/help/cmake-2-8-docs.html#variable:CMAKE_INSTALL_NAME_DIR
-set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+if(NOT DEFINED CMAKE_INSTALL_NAME_DIR)
+ set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+endif(NOT DEFINED )
# 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)
+if(NOT DEFINED CMAKE_INSTALL_RPATH_USE_LINK_PATH)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+endif(NOT DEFINED )
# When this is a subbuild, assume that the parent project controls all of the
following
#======================================================================================
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
