Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
T.J. Corona
CMB-SuperBuild
Commits
a007b083
Commit
a007b083
authored
Mar 13, 2019
by
T.J. Corona
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bundle user-added additional boost libraries
parent
4182af10
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
37 additions
and
5 deletions
+37
-5
CMakeLists.txt
CMakeLists.txt
+4
-2
projects/apple/cmb.bundle.apple.cmake
projects/apple/cmb.bundle.apple.cmake
+8
-2
projects/cmb.bundle.common.cmake
projects/cmb.bundle.common.cmake
+5
-0
projects/unix/cmb.bundle.unix.cmake
projects/unix/cmb.bundle.unix.cmake
+11
-0
projects/win32/cmb.bundle.windows.cmake
projects/win32/cmb.bundle.windows.cmake
+8
-0
superbuild
superbuild
+1
-1
No files found.
CMakeLists.txt
View file @
a007b083
...
...
@@ -95,7 +95,6 @@ function (superbuild_find_projects var)
pythonrequests
pythonrequeststoolbelt
pythonsetuptools
pythonsix
qt
qt4
qt5
...
...
@@ -184,6 +183,9 @@ function (superbuild_add_packaging)
list
(
APPEND superbuild_export_variables
qt5_version
)
list
(
APPEND superbuild_export_variables
BOOST_ADDITIONAL_LIBRARIES
)
include
(
cmb.suffix
)
list
(
APPEND superbuild_export_variables
CMB_PACKAGE_SUFFIX
)
...
...
@@ -233,7 +235,7 @@ set(qt5_skip_modules
qtwebengine
qtwebsockets
)
set
(
BOOST_ADDITIONAL_LIBRARIES
""
CACHE STRING
"Additional boost libraries to build"
)
set
(
BOOST_ADDITIONAL_LIBRARIES
""
CACHE STRING
"Additional boost libraries to build
and package
"
)
mark_as_advanced
(
BOOST_ADDITIONAL_LIBRARIES
)
set
(
boost_minimum_version 1.64.0
)
...
...
projects/apple/cmb.bundle.apple.cmake
View file @
a007b083
foreach
(
program IN LISTS cmb_programs_to_install
)
set
(
additional_libraries
)
set
(
plugins
)
set
(
plugin_paths
)
if
(
program STREQUAL
"modelbuilder"
)
# Install additional libraries in modelbuilder app
foreach
(
library IN LISTS cmb_additional_libraries
)
list
(
APPEND additional_libraries
"
${
superbuild_install_location
}
/lib/lib
${
library
}
.dylib"
)
endforeach
()
# Install CMB plugins in modelbuilder app
foreach
(
plugin IN LISTS cmb_plugins_cmb
)
list
(
APPEND plugin_paths
"
${
superbuild_install_location
}
/Applications/modelbuilder.app/Contents/Plugins/lib
${
plugin
}
.dylib"
)
...
...
@@ -11,8 +17,7 @@ foreach(program IN LISTS cmb_programs_to_install)
# Install CMB plugins in modelbuilder app
foreach
(
plugin IN LISTS cmb_plugins_standalone
)
find_library
(
plugin_path
"lib
${
plugin
}
.dylib"
${
superbuild_install_location
}
/lib
)
list
(
APPEND plugin_paths
${
plugin_path
}
)
list
(
APPEND plugin_paths
"
${
superbuild_install_location
}
/lib/lib
${
plugin
}
.dylib"
)
endforeach
()
list
(
APPEND plugins
${
cmb_plugins_standalone
}
)
...
...
@@ -29,6 +34,7 @@ foreach(program IN LISTS cmb_programs_to_install)
"
${
superbuild_install_location
}
/Applications/
${
program
}
.app/Contents/MacOS/
${
program
}
"
CLEAN
PLUGINS
${
plugin_paths
}
ADDITIONAL_LIBRARIES
${
additional_libraries
}
SEARCH_DIRECTORIES
"
${
superbuild_install_location
}
/lib"
)
foreach
(
icon_filename MacIcon.icns pvIcon.icns
)
...
...
projects/cmb.bundle.common.cmake
View file @
a007b083
...
...
@@ -120,6 +120,11 @@ if (cumulus_enabled)
)
endif
()
set
(
cmb_additional_libraries
)
foreach
(
boost_lib IN LISTS BOOST_ADDITIONAL_LIBRARIES
)
list
(
APPEND cmb_additional_libraries boost_
${
boost_lib
}
)
endforeach
()
set
(
cmb_python_modules
smtk
paraview
...
...
projects/unix/cmb.bundle.unix.cmake
View file @
a007b083
...
...
@@ -80,6 +80,17 @@ foreach (plugin IN LISTS cmb_plugins_paraview)
)
endforeach
()
foreach
(
library IN LISTS cmb_additional_libraries
)
superbuild_unix_install_plugin
(
"lib
${
plugin
}
.so"
"lib"
"lib"
SEARCH_DIRECTORIES
"
${
library_paths
}
"
LOCATION
"lib"
INCLUDE_REGEXES
${
include_regexes
}
EXCLUDE_REGEXES
${
exclude_regexes
}
)
endforeach
()
superbuild_unix_install_python
(
LIBDIR
"lib/cmb-
${
cmb_version
}
"
MODULES
${
cmb_python_modules
}
...
...
projects/win32/cmb.bundle.windows.cmake
View file @
a007b083
...
...
@@ -97,6 +97,14 @@ foreach (plugin IN LISTS cmb_plugins_paraview)
"
${
plugin_library_paths
}
"
)
endforeach
()
foreach
(
library IN LISTS cmb_additional_libraries
)
set
(
additional_library_paths
${
library_paths
}
)
list
(
APPEND additional_library_paths
"bin/
${
library
}
"
)
superbuild_windows_install_plugin
(
"
${
plugin
}
.dll"
"bin"
"
${
plugin_library_paths
}
"
)
endforeach
()
superbuild_windows_install_python
(
MODULES
${
cmb_python_modules
}
MODULE_DIRECTORIES
"
${
superbuild_install_location
}
/bin/Lib/site-packages"
...
...
superbuild
@
3e0749c8
Compare
d51aaaf6
...
3e0749c8
Subproject commit
d51aaaf67210dc0b8e7bce3078dfdbc157e641d3
Subproject commit
3e0749c8db90b4642c72ee9e8fb8a26255884a6e
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment