Commit 1ed528dc authored by Aron Helser's avatar Aron Helser
Browse files

Merge branch 'smtk_extra_args' into 'master'

Add SMTK_EXTRA_CMAKE_ARGUMENTS so client superbuilds can configure smtk

See merge request !744
parents c21ea880 8f23baf6
Pipeline #222047 failed with stages
in 215 minutes and 53 seconds
include(smtk-version)
set(smtk_extra_cmake_args)
set(SMTK_EXTRA_CMAKE_ARGUMENTS ""
CACHE STRING "Extra arguments to be passed to SMTK when configuring.")
mark_as_advanced(SMTK_EXTRA_CMAKE_ARGUMENTS)
set(smtk_extra_cmake_options)
if (WIN32)
# On Windows we expect the Python source for module to be
# in a different place than Unix builds and in a different
# place than SMTK would put it by default. Tell SMTK where
# to install Python source for the smtk module:
list(APPEND smtk_extra_cmake_args
list(APPEND smtk_extra_cmake_options
"-DSMTK_PYTHON_MODULEDIR:PATH=bin/Lib/site-packages")
endif ()
......@@ -26,7 +30,7 @@ if (NOT ENABLE_DOCUMENTATION)
endif()
if (UNIX AND NOT APPLE)
list(APPEND smtk_extra_cmake_args
list(APPEND smtk_extra_cmake_options
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=FALSE)
endif ()
......@@ -67,7 +71,7 @@ superbuild_add_project(smtk
# Additional DLL paths required for SMTK.
-DSMTK_DLL_PATHS:STRING=${smtk_dll_paths}
${smtk_extra_cmake_args}
${smtk_extra_cmake_options}
-DBUILD_SHARED_LIBS:BOOL=ON
-DCMAKE_INSTALL_LIBDIR:STRING=lib
-DSMTK_RELOCATABLE_INSTALL:BOOL=OFF
......@@ -99,7 +103,9 @@ superbuild_add_project(smtk
# Set CMAKE_INSTALL_LIBDIR to "lib" for all projects in the superbuild to
# override OS-specific libdirs that GNUInstallDirs.cmake would otherwise
# set.
-DCMAKE_INSTALL_LIBDIR:STRING=lib)
-DCMAKE_INSTALL_LIBDIR:STRING=lib
${SMTK_EXTRA_CMAKE_ARGUMENTS})
set(smtk_config_version ${smtk_version_major}.${smtk_version_minor}.${smtk_version_patch})
if (WIN32)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment