Commit 16f1e758 authored by John Tourtellott's avatar John Tourtellott
Browse files

Updates for macOS test; moves modelbuilder.app to root folder

parent ec8ad4da
......@@ -52,10 +52,14 @@ function (add_package_import_test generator)
set(this_dir "${CMAKE_SOURCE_DIR}/cmake")
# Current implementation only supports linux
if (UNIX AND NOT APPLE AND NOT CYGWIN)
if (UNIX AND NOT CYGWIN)
set(exe_path "bin/modelbuilder")
set(shell_script "import_python_test.sh")
if (APPLE)
set(exe_path "modelbuilder.app/Contents/MacOS/modelbuilder")
endif ()
add_test(
NAME "package-import-test-${generator}"
COMMAND "${this_dir}/scripts/${shell_script}"
......
......@@ -41,7 +41,7 @@ foreach(program IN LISTS cmb_programs_to_install)
endif ()
superbuild_apple_create_app(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"\${CMAKE_INSTALL_PREFIX}"
"${program}.app"
"${superbuild_install_location}/Applications/${program}.app/Contents/MacOS/${program}"
CLEAN
......@@ -54,13 +54,13 @@ foreach(program IN LISTS cmb_programs_to_install)
if (EXISTS "${icon_path}")
install(
FILES "${icon_path}"
DESTINATION "${cmb_package}/${program}.app/Contents/Resources"
DESTINATION "${program}.app/Contents/Resources"
COMPONENT superbuild)
endif ()
endforeach ()
install(
FILES "${superbuild_install_location}/Applications/${program}.app/Contents/Info.plist"
DESTINATION "${cmb_package}/${program}.app/Contents"
DESTINATION "${program}.app/Contents"
COMPONENT superbuild)
install(
......@@ -84,7 +84,7 @@ foreach(program IN LISTS cmb_programs_to_install)
foreach (executable IN LISTS paraview_executables)
superbuild_apple_install_utility(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"\${CMAKE_INSTALL_PREFIX}"
"${program}.app"
"${superbuild_install_location}/bin/${executable}"
SEARCH_DIRECTORIES
......@@ -99,14 +99,13 @@ foreach(program IN LISTS cmb_programs_to_install)
if (python3_built_by_superbuild)
include(python3.functions)
superbuild_install_superbuild_python3(
DESTINATION_SUBDIR "${cmb_package}"
BUNDLE "${program}.app")
endif ()
file(GLOB egg_dirs
"${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/*.egg/")
superbuild_apple_install_python(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"\${CMAKE_INSTALL_PREFIX}"
"${program}.app"
MODULES ${cmb_python_modules}
MODULE_DIRECTORIES
......@@ -120,25 +119,25 @@ foreach(program IN LISTS cmb_programs_to_install)
if (matplotlib_enabled)
install(
DIRECTORY "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/matplotlib/mpl-data/"
DESTINATION "${cmb_package}/${program}.app/Contents/Python/matplotlib/mpl-data"
DESTINATION "${program}.app/Contents/Python/matplotlib/mpl-data"
COMPONENT superbuild)
endif ()
if (pythonrequests_enabled)
install(
FILES "${superbuild_install_location}/lib/python${superbuild_python_version}/site-packages/requests/cacert.pem"
DESTINATION "${cmb_package}/${program}.app/Contents/Python/requests"
DESTINATION "${program}.app/Contents/Python/requests"
COMPONENT superbuild)
endif ()
if (paraviewweb_enabled)
install(
FILES "${superbuild_install_location}/Applications/paraview.app/Contents/Python/paraview/web/defaultProxies.json"
DESTINATION "${cmb_package}/${program}.app/Contents/Python/paraview/web"
DESTINATION "${program}.app/Contents/Python/paraview/web"
COMPONENT "superbuild")
install(
DIRECTORY "${superbuild_install_location}/share/paraview/web"
DESTINATION "${cmb_package}/${program}.app/Contents/Resources"
DESTINATION "${program}.app/Contents/Resources"
COMPONENT "superbuild")
endif ()
......@@ -147,7 +146,7 @@ foreach(program IN LISTS cmb_programs_to_install)
get_filename_component(qt5_plugin_group "${qt5_plugin_group}" NAME)
superbuild_apple_install_module(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"\${CMAKE_INSTALL_PREFIX}"
"${program}.app"
"${qt5_plugin_path}"
"Contents/Plugins/${qt5_plugin_group}"
......@@ -155,7 +154,7 @@ foreach(program IN LISTS cmb_programs_to_install)
endforeach ()
if (cmb_doc_base_dir)
set(cmb_doc_dir "${cmb_package}/${program}.app/${cmb_doc_base_dir}")
set(cmb_doc_dir "${program}.app/${cmb_doc_base_dir}")
endif ()
# Install PDF guides.
......@@ -173,7 +172,7 @@ endif ()
if (meshkit_enabled)
foreach (meshkit_exe IN ITEMS coregen assygen)
superbuild_apple_install_utility(
"\${CMAKE_INSTALL_PREFIX}/${cmb_package}"
"\${CMAKE_INSTALL_PREFIX}"
"modelbuilder.app"
"${superbuild_install_location}/bin/${meshkit_exe}"
SEARCH_DIRECTORIES "${library_paths}"
......
......@@ -2,7 +2,6 @@ set(cmb_doc_dir "share/cmb/doc")
set(plugin_dir "lib")
include(modelbuilder.bundle.common)
set(cmb_package "modelbuilder ${cmb_version_major}.${cmb_version_minor}.${cmb_version_patch}")
set(cmb_doc_base_dir "Contents/doc")
include(cmb.bundle.apple)
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