Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
LidarView
LidarView-Superbuild
Commits
835fbedd
Commit
835fbedd
authored
Mar 29, 2021
by
Jerome Dias
Browse files
[refactor] Append lidarview_modules in LidarviewBundleCommon.
parent
92b2209a
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMake/bundle/LidarviewBundleCommon.cmake
View file @
835fbedd
...
...
@@ -51,6 +51,17 @@ set(lidarview_executables
"
${
SOFTWARE_NAME
}
"
)
# Sometimes some modules are not fully processed automatically on bundle.
# That is why we use a list of lidarview_modules that will be installed manually in LidarviewBundle.
set
(
lidarview_modules
)
if
(
WIN32
)
list
(
APPEND lidarview_modules
"
${
superbuild_install_location
}
/bin/LidarPluginPython.pyd"
)
list
(
APPEND lidarview_modules
"
${
superbuild_install_location
}
/bin/LidarPluginPythonD.dll"
)
elseif
(
APPLE
)
list
(
APPEND lidarview_modules
"LidarPluginPython.so"
)
list
(
APPEND lidarview_modules
"libLidarPluginPythonD.dylib"
)
endif
()
set
(
python_modules
paraview
vtk
...
...
CMake/bundle/apple/LidarviewBundle.cmake
View file @
835fbedd
...
...
@@ -114,10 +114,7 @@ endforeach()
# My understanding is that these module are not processed automatically
# by superbuild_apple_create_app because there is no path leading to
# them in binary LidarView or in any of its .dylib dependencies
set
(
my_modules
)
list
(
APPEND my_modules
"LidarPluginPython.so"
)
list
(
APPEND my_modules
"libLidarPluginPythonD.dylib"
)
foreach
(
module
${
my_modules
}
)
foreach
(
module
${
lidarview_modules
}
)
superbuild_apple_install_module
(
"
\$
{CMAKE_INSTALL_PREFIX}"
"
${
lidarview_appname
}
"
...
...
CMake/bundle/win32/LidarviewBundle.cmake
View file @
835fbedd
...
...
@@ -77,6 +77,20 @@ if (qt5_enabled)
endforeach
()
endif
()
# some dlls are missing.
# They should be installed automatically because of paraview/vtk's cmake lists
file
(
GLOB vtk_dlls
"
${
superbuild_install_location
}
/bin/vtk*.dll"
)
install
(
FILES
${
vtk_dlls
}
DESTINATION
"bin"
COMPONENT superbuild
)
unset
(
vtk_dlls
)
# install all lidarview_modules appended in LidarviewBundleCommon
install
(
FILES
${
lidarview_modules
}
DESTINATION
"bin"
COMPONENT superbuild
)
file
(
GLOB boost_bin_dll
"
${
superbuild_install_location
}
/bin/boost*.dll"
)
install
(
FILES
${
boost_bin_dll
}
DESTINATION
"bin"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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