Skip to content

Commit 5a4b5b1

Browse files
Rafael PalomarRafael Palomar
Rafael Palomar
authored and
Rafael Palomar
committed
ENH: Fix installation of sofa libraries
ENH: Fix MacOS paths WIP: Simplify installation of Sofa libraries WIP: Include default plugins list
1 parent 1e45a22 commit 5a4b5b1

File tree

2 files changed

+16
-17
lines changed

2 files changed

+16
-17
lines changed

CMakeLists.txt

+12-6
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,25 @@ set(EXTENSION_CPACK_INSTALL_CMAKE_PROJECTS)
4545
if(NOT APPLE)
4646
list(APPEND EXTENSION_CPACK_INSTALL_CMAKE_PROJECTS "${EXTENSION_SUPERBUILD_BINARY_DIR}/GLEW-build;glew;Runtime;/")
4747
endif()
48-
list(APPEND EXTENSION_CPACK_INSTALL_CMAKE_PROJECTS "${Sofa_DIR};Sofa;ALL;/")
48+
4949
set(${EXTENSION_NAME}_CPACK_INSTALL_CMAKE_PROJECTS "${EXTENSION_CPACK_INSTALL_CMAKE_PROJECTS}" CACHE STRING "List of external projects to install" FORCE)
5050

5151
if(APPLE)
52-
set(EXTENSION_FIXUP_BUNDLE_LIBRARY_DIRECTORIES)
53-
54-
# GLEW
5552
set(GLEW_RUNTIME_LIBRARY_DIR "${EXTENSION_SUPERBUILD_BINARY_DIR}/GLEW-install/${Slicer_INSTALL_THIRDPARTY_LIB_DIR}")
56-
list(APPEND EXTENSION_FIXUP_BUNDLE_LIBRARY_DIRECTORIES ${GLEW_RUNTIME_LIBRARY_DIR})
5753

58-
set(${EXTENSION_NAME}_FIXUP_BUNDLE_LIBRARY_DIRECTORIES "${EXTENSION_FIXUP_BUNDLE_LIBRARY_DIRECTORIES}" CACHE STRING "List of directories to look up libraries to copy into the application package" FORCE)
54+
list(APPEND EXTENSION_FIXUP_BUNDLE_LIBRARY_DIRECTORIES ${GLEW_RUNTIME_LIBRARY_DIR})
55+
set(${EXTENSION_NAME}_FIXUP_BUNDLE_LIBRARY_DIRECTORIES "${EXTENSION_FIXUP_BUNDLE_LIBRARY_DIRECTORIES}" CACHE STRING "List of directories to look up libraries to copy into the application package" FORCE)
56+
5957
endif()
6058

59+
install(DIRECTORY "${Sofa_DIR}/lib"
60+
DESTINATION "${Slicer_INSTALL_THIRDPARTY_LIB_DIR}/Sofa/"
61+
COMPONENT RuntimeLibraries
62+
PATTERN "cmake" EXCLUDE
63+
PATTERN "metis.framework" EXCLUDE
64+
#PATTERN "plugin_list.conf.default" EXCLUDE
65+
)
66+
6167
#-----------------------------------------------------------------------------
6268
list(APPEND CPACK_INSTALL_CMAKE_PROJECTS "${CMAKE_BINARY_DIR};${EXTENSION_NAME};ALL;/")
6369
list(APPEND CPACK_INSTALL_CMAKE_PROJECTS "${${EXTENSION_NAME}_CPACK_INSTALL_CMAKE_PROJECTS}")

SlicerSofa/SofaEnvironment/__init__.py

+4-11
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,11 @@
22
import sys
33

44
script_dir = os.path.dirname(os.path.abspath(__file__))
5+
sys.path = [
6+
script_dir + '/../../Sofa/lib/python3/site-packages',
7+
] + sys.path
58

6-
if os.path.isdir(script_dir + '/../../../../../Sofa-build'): # Build tree
7-
os.environ['SOFA_ROOT'] = script_dir + '/../../../../../Sofa-build'
8-
else: # Install tree
9-
# Sofa does not allow much configurability of the install tree, therefore it is needed
10-
# to add extra python paths.
11-
sys.path = [
12-
script_dir + '/../../../../plugins/SofaPython3/lib/python3/site-packages',
13-
script_dir + '/../../../../plugins/STLIB/lib/python3/site-packages'
14-
] + sys.path
15-
16-
os.environ['SOFA_ROOT'] = script_dir + '/../../../../'
9+
os.environ['SOFA_ROOT'] = script_dir + '/../../Sofa'
1710

1811
# Sofa, by default, will capture the exception handling. This is a workaround
1912
# to keep the exception handling in PythonSlicer

0 commit comments

Comments
 (0)