...
 
Commits (111)

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

This diff is collapsed.
......@@ -76,7 +76,7 @@ OPTION(OVITO_BUILD_PLUGIN_PYSCRIPT "Build the Python scripting plugin." "ON")
OPTION(OVITO_BUILD_PLUGIN_NETCDFPLUGIN "Build the NetCDF plugin." "ON")
OPTION(OVITO_BUILD_PLUGIN_POVRAY "Build the POV-Ray renderer plugin." "ON")
OPTION(OVITO_BUILD_PLUGIN_OSPRAY "Build the OSPRay renderer plugin (experimental)." "OFF")
OPTION(OVITO_BUILD_PLUGIN_CORRELATION "Build the correlation function modifier plugin." "ON")
OPTION(OVITO_BUILD_PLUGIN_CORRELATION "Build the spatial correlation function modifier plugin." "ON")
OPTION(OVITO_BUILD_PLUGIN_VR "Build the virtual reality plugin (experimental)." "OFF")
OPTION(OVITO_BUILD_PLUGIN_VOROTOP "Build the VoroTop modifier plugin." "ON")
OPTION(OVITO_BUILD_PLUGIN_GALAMOST "Build the GALAMOST I/O plugin." "ON")
......
......@@ -5,7 +5,7 @@ OVITO - Open Visualization Tool
OVITO is a scientific visualization and analysis software for atomistic and other
particle simulation data. Visit the website for more information:
http://www.ovito.org/
https://www.ovito.org/
Author:
Alexander Stukowski (mail@ovito.org)
......
# Try to find the Botan library
# BOTAN_FOUND - system has Botan lib
# Botan_INCLUDE_DIRS - the include directories needed
# Botan_LIBRARIES - Libraries needed to use Botan
FIND_PATH(BOTAN_INCLUDE_DIR NAMES botan/botan.h PATH_SUFFIXES botan-1.10)
FIND_LIBRARY(BOTAN_LIBRARY NAMES botan botan-1.10)
SET(Botan_INCLUDE_DIRS ${BOTAN_INCLUDE_DIR})
SET(Botan_LIBRARIES ${BOTAN_LIBRARY})
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Botan DEFAULT_MSG BOTAN_LIBRARY BOTAN_INCLUDE_DIR)
MARK_AS_ADVANCED(BOTAN_INCLUDE_DIR BOTAN_LIBRARY)
# Try to find the FFTW3 library
# FFTW3_FOUND - system has FFTW3 lib
# FFTW3_INCLUDE_DIRS - the include directories needed
# FFTW3_LIBRARIES - libraries needed
FIND_PATH(FFTW3_INCLUDE_DIR NAMES fftw3.h)
IF(OVITO_DOUBLE_PRECISION_FP)
FIND_LIBRARY(FFTW3_LIBRARY NAMES fftw3 libfftw3)
ELSE()
FIND_LIBRARY(FFTW3_LIBRARY NAMES fftw3f libfftw3f)
ENDIF()
SET(FFTW3_INCLUDE_DIRS ${FFTW3_INCLUDE_DIR})
SET(FFTW3_LIBRARIES ${FFTW3_LIBRARY})
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFTW3 DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE_DIR)
MARK_AS_ADVANCED(FFTW3_INCLUDE_DIR FFTW3_LIBRARY)
# Try to find the OpenBabel library
# OPENBABEL_FOUND - system has OpenBabel lib
# OpenBabel_INCLUDE_DIRS - the include directories needed
# OpenBabel_LIBRARIES - libraries needed
FIND_PATH(OPENBABEL_INCLUDE_DIR NAMES openbabel/mol.h PATH_SUFFIXES openbabel-2.0)
FIND_LIBRARY(OPENBABEL_LIBRARY NAMES openbabel)
SET(OpenBabel_INCLUDE_DIRS ${OPENBABEL_INCLUDE_DIR})
SET(OpenBabel_LIBRARIES ${OPENBABEL_LIBRARY})
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenBabel DEFAULT_MSG OPENBABEL_LIBRARY OPENBABEL_INCLUDE_DIR)
MARK_AS_ADVANCED(OPENBABEL_INCLUDE_DIR OPENBABEL_LIBRARY)
......@@ -4,7 +4,11 @@
# OpenVR_LIBRARIES - libraries needed
FIND_PATH(OPENVR_INCLUDE_DIR NAMES openvr.h)
FIND_LIBRARY(OPENVR_LIBRARY NAMES openvr openvr_api)
FIND_LIBRARY(OPENVR_LIBRARY
NAMES openvr openvr_api
PATH_SUFFIXES osx64 linux64 win64
NO_DEFAULT_PATH
NO_CMAKE_FIND_ROOT_PATH)
SET(OpenVR_INCLUDE_DIRS ${OPENVR_INCLUDE_DIR})
SET(OpenVR_LIBRARIES ${OPENVR_LIBRARY})
......@@ -13,3 +17,16 @@ INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenVR DEFAULT_MSG OPENVR_LIBRARY OPENVR_INCLUDE_DIR)
MARK_AS_ADVANCED(OPENVR_INCLUDE_DIR OPENVR_LIBRARY)
# Create an CMake import target for the OpenVR framework.
IF(OPENVR_FOUND)
ADD_LIBRARY(OpenVR::OpenVR UNKNOWN IMPORTED)
SET_TARGET_PROPERTIES(OpenVR::OpenVR PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${OPENVR_INCLUDE_DIR}")
IF(APPLE)
IF(OPENVR_LIBRARY MATCHES "/([^/]+)\\.framework$")
SET_TARGET_PROPERTIES(OpenVR::OpenVR PROPERTIES IMPORTED_LOCATION "${OPENVR_LIBRARY}/${CMAKE_MATCH_1}")
ELSE()
SET_TARGET_PROPERTIES(OpenVR::OpenVR PROPERTIES IMPORTED_LOCATION "${OPENVR_LIBRARY}")
ENDIF()
ENDIF()
ENDIF()
\ No newline at end of file
IF(APPLE)
# Install the Info.plist file.
CONFIGURE_FILE("${OVITO_SOURCE_BASE_DIR}/src/main/resources/Info.plist" "${OVITO_BINARY_DIRECTORY}/${MACOSX_BUNDLE_NAME}.app/Contents/Info.plist")
CONFIGURE_FILE("${OVITO_SOURCE_BASE_DIR}/src/ovito_exe/resources/Info.plist" "${OVITO_BINARY_DIRECTORY}/${MACOSX_BUNDLE_NAME}.app/Contents/Info.plist")
SET_TARGET_PROPERTIES(Ovito PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${OVITO_BINARY_DIRECTORY}/${MACOSX_BUNDLE_NAME}.app/Contents/Info.plist")
# Copy the application icon into the resource directory.
INSTALL(FILES "${OVITO_SOURCE_BASE_DIR}/src/main/resources/ovito.icns" DESTINATION "${OVITO_RELATIVE_SHARE_DIRECTORY}")
INSTALL(FILES "${OVITO_SOURCE_BASE_DIR}/src/ovito_exe/resources/ovito.icns" DESTINATION "${OVITO_RELATIVE_SHARE_DIRECTORY}")
SET(QT_PLUGINS_DIR "${_qt5Core_install_prefix}/plugins")
......@@ -68,8 +68,8 @@ IF(APPLE)
SET(\${default_embedded_path_var} \"\${path}\" PARENT_SCOPE)
MESSAGE(\" Embedding path override: \${item} -> \${path}\")
ENDIF()
# Leave core Ovito libraries in the MacOS/ directory:
IF((item MATCHES \"libCore\\\\.dylib$\" OR item MATCHES \"libOpenGLRenderer\\\\.dylib$\" OR item MATCHES \"libmuParser\\\\.dylib$\" OR item MATCHES \"libNetCDFIntegration\\\\.dylib$\" OR item MATCHES \"libGui\\\\.dylib$\" OR item MATCHES \"libQwt\\\\.dylib$\") AND item MATCHES \"^@rpath\")
# Leave helper libraries in the MacOS/ directory:
IF((item MATCHES \"libmuParser\\\\.dylib$\" OR item MATCHES \"libNetCDFIntegration\\\\.dylib$\" OR item MATCHES \"libQwt\\\\.dylib$\") AND item MATCHES \"^@rpath\")
SET(path \"@executable_path\")
SET(\${default_embedded_path_var} \"\${path}\" PARENT_SCOPE)
MESSAGE(\" Embedding path override: \${item} -> \${path}\")
......@@ -112,7 +112,7 @@ IF(APPLE)
EXECUTE_PROCESS(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"../../../Resources\" \"\${CMAKE_INSTALL_PREFIX}/${MACOSX_BUNDLE_NAME}.app/Contents/MacOS/Ovito.App/Contents/Resources\")
EXECUTE_PROCESS(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"../../../Frameworks\" \"\${CMAKE_INSTALL_PREFIX}/${MACOSX_BUNDLE_NAME}.app/Contents/MacOS/Ovito.App/Contents/Frameworks\")
EXECUTE_PROCESS(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink \"../../../PlugIns\" \"\${CMAKE_INSTALL_PREFIX}/${MACOSX_BUNDLE_NAME}.app/Contents/MacOS/Ovito.App/Contents/PlugIns\")
CONFIGURE_FILE(\"${CMAKE_SOURCE_DIR}/src/main/resources/Info.plist\" \"\${CMAKE_INSTALL_PREFIX}/${MACOSX_BUNDLE_NAME}.app/Contents/MacOS/Ovito.App/Contents/Info.plist\")
CONFIGURE_FILE(\"${CMAKE_SOURCE_DIR}/src/ovito_exe/resources/Info.plist\" \"\${CMAKE_INSTALL_PREFIX}/${MACOSX_BUNDLE_NAME}.app/Contents/MacOS/Ovito.App/Contents/Info.plist\")
EXECUTE_PROCESS(COMMAND defaults write \"\${CMAKE_INSTALL_PREFIX}/${MACOSX_BUNDLE_NAME}.app/Contents/MacOS/Ovito.App/Contents/Info\" LSUIElement 1)
FILE(GLOB DylibsToSymlink \"\${CMAKE_INSTALL_PREFIX}/${MACOSX_BUNDLE_NAME}.app/Contents/MacOS/*.dylib\")
FOREACH(FILE_ENTRY \${DylibsToSymlink})
......
###############################################################################
#
#
# Copyright (2013) Alexander Stukowski
#
# This file is part of OVITO (Open Visualization Tool).
......@@ -60,8 +60,8 @@ ELSEIF(WIN32)
SET(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
SET(CPACK_PACKAGE_EXECUTABLES "ovito" "OVITO (The Open Visualization Tool)")
SET(CPACK_NSIS_CREATE_ICONS_EXTRA "
File \\\"C:\\\\Program Files (x86)\\\\Microsoft Visual Studio 14.0\\\\VC\\\\redist\\\\1033\\\\vcredist_x64.exe\\\"
ReadRegStr $1 HKLM \\\"SOFTWARE\\\\Microsoft\\\\DevDiv\\\\vc\\\\Servicing\\\\14.0\\\\RuntimeMinimum\\\" \\\"Install\\\"
File \\\"C:\\\\Program Files (x86)\\\\Microsoft Visual Studio\\\\2019\\\\BuildTools\\\\VC\\\\Redist\\\\MSVC\\\\14.21.27702\\\\vcredist_x64.exe\\\"
ReadRegStr $1 HKLM \\\"SOFTWARE\\\\Microsoft\\\\DevDiv\\\\VC\\\\Servicing\\\\14.0\\\\RuntimeMinimum\\\" \\\"Install\\\"
StrCmp $1 1 vc_runtime_installed
ExecWait '\\\"$INSTDIR\\\\vcredist_x64.exe\\\" /passive /norestart'
vc_runtime_installed:
......@@ -87,11 +87,11 @@ INCLUDE(CPack)
IF(WIN32 AND OVITO_BUILD_APPSTORE_VERSION)
# Package Ovito for the Windows Store.
CONFIGURE_FILE("${OVITO_SOURCE_BASE_DIR}/src/main/resources/AppxManifest.xml" "${OVITO_BINARY_DIRECTORY}/AppxManifest.xml")
CONFIGURE_FILE("${OVITO_SOURCE_BASE_DIR}/src/ovito_exe/resources/AppxManifest.xml" "${OVITO_BINARY_DIRECTORY}/AppxManifest.xml")
INSTALL(FILES "${OVITO_BINARY_DIRECTORY}/appxmanifest.xml" DESTINATION "./")
INSTALL(FILES "${OVITO_SOURCE_BASE_DIR}/src/gui/resources/mainwin/window_icon_44.png" DESTINATION "./")
INSTALL(FILES "${OVITO_SOURCE_BASE_DIR}/src/gui/resources/mainwin/window_icon_150.png" DESTINATION "./")
INSTALL(FILES "${OVITO_SOURCE_BASE_DIR}/src/ovito/gui/resources/mainwin/window_icon_44.png" DESTINATION "./")
INSTALL(FILES "${OVITO_SOURCE_BASE_DIR}/src/ovito/gui/resources/mainwin/window_icon_150.png" DESTINATION "./")
ADD_CUSTOM_TARGET(appx
COMMAND "C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64\\MakeAppx.exe" pack /o /d "${CMAKE_INSTALL_PREFIX}" /p "${CMAKE_INSTALL_PREFIX}\\..\\ovito-${OVITO_VERSION_STRING}.appx"
#COMMAND SignTool sign /fd SHA256 /a /f "${CMAKE_INSTALL_PREFIX}\\..\\..\\ovito.pfx" "${CMAKE_INSTALL_PREFIX}\\..\\ovito-${OVITO_VERSION_STRING}.appx"
......
......@@ -23,24 +23,26 @@ MACRO(OVITO_STANDARD_PLUGIN target_name)
# Make the name of current plugin available to the source code.
TARGET_COMPILE_DEFINITIONS(${target_name} PRIVATE "OVITO_PLUGIN_NAME=\"${target_name}\"")
# Link to OVITO's core module.
TARGET_LINK_LIBRARIES(${target_name} PUBLIC Core)
# Link to OVITO's core module (unless it's the core plugin itself we are defining).
IF(NOT ${target_name} STREQUAL "Core")
TARGET_LINK_LIBRARIES(${target_name} PUBLIC Core)
ENDIF()
# Link to OVITO's GUI module when the plugin provides a UI.
IF(${ARG_GUI_PLUGIN})
TARGET_LINK_LIBRARIES(${target_name} PUBLIC Gui)
TARGET_LINK_LIBRARIES(${target_name} PUBLIC Gui)
TARGET_LINK_LIBRARIES(${target_name} PUBLIC Qt5::Widgets)
ENDIF()
# Link to Qt5.
TARGET_LINK_LIBRARIES(${target_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Concurrent)
# Link to other required libraries needed by this specific plugin.
TARGET_LINK_LIBRARIES(${target_name} PUBLIC ${lib_dependencies})
# Link to other required libraries needed by this specific plugin, which are not visible to dependent plugins.
TARGET_LINK_LIBRARIES(${target_name} PRIVATE ${private_lib_dependencies})
# Link to Qt5.
TARGET_LINK_LIBRARIES(${target_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Concurrent)
# Link to other plugin modules that are dependencies of this plugin.
FOREACH(plugin_name ${plugin_dependencies})
STRING(TOUPPER "${plugin_name}" uppercase_plugin_name)
......@@ -82,21 +84,17 @@ MACRO(OVITO_STANDARD_PLUGIN target_name)
SET_TARGET_PROPERTIES(${target_name} PROPERTIES LINK_FLAGS "-headerpad_max_install_names")
ENDIF(APPLE)
# Enable the use of @rpath on macOS.
SET_TARGET_PROPERTIES(${target_name} PROPERTIES MACOSX_RPATH TRUE)
SET_TARGET_PROPERTIES(${target_name} PROPERTIES INSTALL_RPATH "@loader_path/;@executable_path/;@loader_path/../MacOS/;@executable_path/../Frameworks/")
IF(APPLE)
# Enable the use of @rpath on macOS.
SET_TARGET_PROPERTIES(${target_name} PROPERTIES MACOSX_RPATH TRUE)
SET_TARGET_PROPERTIES(${target_name} PROPERTIES INSTALL_RPATH "@loader_path/;@executable_path/;@loader_path/../MacOS/;@executable_path/../Frameworks/")
# The build tree target should have rpath of install tree target.
SET_TARGET_PROPERTIES(${target_name} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
ELSEIF(UNIX)
# Look for other shared libraries in the parent directory ("lib/ovito/") and in the plugins directory ("lib/ovito/plugins/")
SET_TARGET_PROPERTIES(${target_name} PROPERTIES INSTALL_RPATH "$ORIGIN:$ORIGIN/..")
ENDIF()
# Place compiled plugin module into the plugins directory.
SET_TARGET_PROPERTIES(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${OVITO_PLUGINS_DIRECTORY}")
SET_TARGET_PROPERTIES(${target_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OVITO_PLUGINS_DIRECTORY}")
# Install Python wrapper files.
IF(python_wrappers AND OVITO_BUILD_PLUGIN_PYSCRIPT)
# Install the Python source files that belong to the plugin, which provide the scripting interface.
......@@ -105,13 +103,28 @@ MACRO(OVITO_STANDARD_PLUGIN target_name)
COMMENT "Copying Python files for plugin ${target_name}")
ENDIF()
# This plugin will be part of the installation package.
INSTALL(TARGETS ${target_name} EXPORT OVITO
RUNTIME DESTINATION "${OVITO_RELATIVE_PLUGINS_DIRECTORY}"
LIBRARY DESTINATION "${OVITO_RELATIVE_PLUGINS_DIRECTORY}"
ARCHIVE DESTINATION "${OVITO_RELATIVE_LIBRARY_DIRECTORY}" COMPONENT "development")
# Make this module part of the installation package.
IF(WIN32 AND (${target_name} STREQUAL "Core" OR ${target_name} STREQUAL "Gui"))
# On Windows, the Core and Gui DLLs need to be plavced in the same directory
# as the Ovito executable, because Windows won't find them if they are in the
# plugins subdirectory.
SET_TARGET_PROPERTIES(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${OVITO_BINARY_DIRECTORY}")
SET_TARGET_PROPERTIES(${target_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OVITO_BINARY_DIRECTORY}")
INSTALL(TARGETS ${target_name} EXPORT OVITO
RUNTIME DESTINATION "${OVITO_RELATIVE_BINARY_DIRECTORY}"
LIBRARY DESTINATION "${OVITO_RELATIVE_BINARY_DIRECTORY}"
ARCHIVE DESTINATION "${OVITO_RELATIVE_LIBRARY_DIRECTORY}" COMPONENT "development")
ELSE()
# Install all plugins into the plugins directory.
SET_TARGET_PROPERTIES(${target_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${OVITO_PLUGINS_DIRECTORY}")
SET_TARGET_PROPERTIES(${target_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OVITO_PLUGINS_DIRECTORY}")
INSTALL(TARGETS ${target_name} EXPORT OVITO
RUNTIME DESTINATION "${OVITO_RELATIVE_PLUGINS_DIRECTORY}"
LIBRARY DESTINATION "${OVITO_RELATIVE_PLUGINS_DIRECTORY}"
ARCHIVE DESTINATION "${OVITO_RELATIVE_LIBRARY_DIRECTORY}" COMPONENT "development")
ENDIF()
# Keep a list of plugins.
# Maintain the list of all plugins.
LIST(APPEND OVITO_PLUGIN_LIST ${target_name})
SET(OVITO_PLUGIN_LIST ${OVITO_PLUGIN_LIST} PARENT_SCOPE)
......
......@@ -2,5 +2,10 @@
import sys
if __name__ == '__main__':
from sphinx import main
sys.exit(main(sys.argv))
\ No newline at end of file
try:
from sphinx.cmd.build import main
except ImportError: # Fallback for older Sphinx versions:
from sphinx import main
sys.exit(main())
\ No newline at end of file
......@@ -733,9 +733,9 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.
INPUT = ../../src/core/ \
../../src/plugins/particles/ \
../../src/plugins/netcdf/
INPUT = ../../src/ovito/core/ \
../../src/ovito/particles/ \
../../src/ovito/netcdf/
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
......@@ -770,8 +770,8 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.
EXCLUDE = ../../src/plugins/particles/util/polytess/ \
../../src/core/utilities/io/gzdevice/
EXCLUDE = ../../src/ovito/particles/util/polytess/ \
../../src/ovito/core/utilities/io/gzdevice/
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
......@@ -1941,7 +1941,7 @@ PREDEFINED = ONLY_FOR_DOXYGEN \
# definition found in the source code.
# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
EXPAND_AS_DEFINED =
EXPAND_AS_DEFINED =
# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
# remove all refrences to function-like macros that are alone on a line, have an
......
This diff is collapsed.
......@@ -4,14 +4,14 @@ Install third-party tools
export MACOSX_DEPLOYMENT_TARGET=10.12
sudo echo "macos_deployment_target 10.12" >> /opt/local/etc/macports/macports.conf
sudo port install cmake docbook-xml doxygen libxslt boost yasm povray
sudo port install -s fftw-3 libssh
sudo port install -s libssh
**************************************************************************
Install Qt libraries, version 5.9.7
Install Qt libraries, version 5.12.5
**************************************************************************
# This is a workaround to let VS Code Intellisense find the Qt headers:
cd $HOME/Qt/5.9.7/clang_64/
cd $HOME/Qt/5.12.5/clang_64/
mkdir headers
cd headers
ln -s $PWD/../lib/QtCore.framework/Versions/5/Headers/ QtCore
......@@ -37,7 +37,7 @@ python3 configure.py \
--no-designer-plugin \
--no-qml-plugin \
--assume-shared \
--qmake $HOME/Qt/5.9.7/clang_64/bin/qmake \
--qmake $HOME/Qt/5.*.*/clang_64/bin/qmake \
--sip=/Library/Frameworks/Python.framework/Versions/3.7/bin/sip \
--concatenate \
--enable QtCore \
......@@ -62,13 +62,13 @@ Edit "site.py" of the Python interpreter and set
**************************************************************************
Download and build QScintilla2
**************************************************************************
cd QScintilla_gpl-2.10.8/Qt4Qt5/
$HOME/Qt/5.9.7/clang_64/bin/qmake qscintilla.pro && \
make -j4 && \
install_name_tool -id $PWD/libqscintilla2_qt5.13.2.1.dylib libqscintilla2_qt5.13.2.1.dylib
cd QScintilla_gpl-2.*.*/Qt4Qt5/
$HOME/Qt/5.*.*/clang_64/bin/qmake qscintilla.pro && \
make && \
install_name_tool -id $PWD/libqscintilla2_qt5.*.*.*.dylib libqscintilla2_qt5.*.*.*.dylib
**************************************************************************
Build static Libav:
Build Libav:
**************************************************************************
cd libav-11.12
export MACOSX_DEPLOYMENT_TARGET=10.12
......@@ -98,8 +98,8 @@ cmake \
-DHDF5_BUILD_TOOLS=ON \
-DHDF5_BUILD_WITH_INSTALL_NAME=ON \
-DBUILD_TESTING=OFF \
../hdf5-1.10.2
make -j4 install
../hdf5-1.*.*
make install
**************************************************************************
Download and build NetCDF:
......@@ -117,9 +117,9 @@ cmake \
-DENABLE_HDF4=OFF \
-DUSE_HDF5=ON \
-DHDF5_DIR=$HOME/progs/hdf5/share/cmake/hdf5 \
../netcdf-4.6.1/
make -j4 install
cd ../netcdf/lib
../netcdf-c-4.*.* && \
make install && \
cd ../netcdf/lib && \
install_name_tool -id $PWD/libnetcdf.dylib libnetcdf.dylib
**************************************************************************
......@@ -139,11 +139,11 @@ mkdir build
cd build
cmake -G "Xcode" \
-DCMAKE_INSTALL_PREFIX=$HOME/progs/embree_install \
-DEMBREE_ISPC_EXECUTABLE=$HOME/progs/ispc-v1.9.2-osx/ispc \