Commit 96310551 authored by Ben Boeckel's avatar Ben Boeckel
Browse files

vortexfinder2: update to upstream master

All of our patches have been merged, so use a new tarball.
parent 135cbaa1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04ea0cf..12a2ed8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,7 @@ include_directories (
)
configure_file (def.h.cmake def.h)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/def.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/def.h DESTINATION ${VTK_INSTALL_INCLUDE_DIR})
add_subdirectory (common)
add_subdirectory (io)
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index b651837..9940102 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -53,5 +53,5 @@ endif ()
target_link_libraries (glcommon PUBLIC ${deps})
-install (FILES ${common_headers} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/common)
-install (TARGETS glcommon DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install (FILES ${common_headers} DESTINATION ${VTK_INSTALL_INCLUDE_DIR}/common)
+install (TARGETS glcommon DESTINATION ${VTK_INSTALL_LIBRARY_DIR})
diff --git a/src/in_situ/CMakeLists.txt b/src/in_situ/CMakeLists.txt
index 7a9928f..c9b773f 100644
--- a/src/in_situ/CMakeLists.txt
+++ b/src/in_situ/CMakeLists.txt
@@ -7,9 +7,9 @@ if (WITH_CUDA)
endif ()
install (TARGETS vf2gpu
- DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+ DESTINATION ${VTK_INSTALL_LIBRARY_DIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ)
install (FILES vf2gpu.h
- DESTINATION ${CMAKE_INSTALL_PREFIX}/include
+ DESTINATION ${VTK_INSTALL_INCLUDE_DIR}
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49162fa..1033ede 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ else()
option (WITH_ROCKSDB "Build with RocksDB" OFF)
option (WITH_PARAVIEW "Build paraview plugins" OFF)
option (WITH_FORTRAN "Enable fortran" OFF)
+ option (WITH_MACOS_RPATH "Enable macOS rpath support" ON)
set (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-modules)
set (EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -47,8 +48,8 @@ else()
find_package (LAPACK REQUIRED)
endif ()
- # Always use a full RPATH
- if(APPLE)
+ # Set up RPATH if requested.
+ if(WITH_MACOS_RPATH)
set(CMAKE_MACOSX_RPATH ON)
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
paraview_add_plugin(vortexfinder2
PLUGIN_NAME VortexFinder2
DEPENDS boost qt
DEPENDS boost qt cxx11
DEPENDS_OPTIONAL qt4 qt5)
# XXX: Remove when https://github.com/tjcorona/vortexfinder2/pull/2 is merged.
superbuild_add_extra_cmake_args(
-DWITH_CXX11:BOOL=${cxx11_enabled}
-DWITH_MACOS_RPATH:BOOL=FALSE)
superbuild_apply_patch(vortexfinder2 library-install
"Use VTK's install library directory")
superbuild_apply_patch(vortexfinder2 rpath-option
"Make @rpath/ usage optional")
......@@ -81,9 +81,8 @@ superbuild_set_revision(vrpn
superbuild_set_revision(vortexfinder2
# https://github.com/hguo/vortexfinder2.git
# https://github.com/tjcorona/vortexfinder2.git
URL "http://www.paraview.org/files/dependencies/vortexfinder2-36d381ae68d9693b4f25003d2c8bea3178d5bb19.tar.gz"
URL_MD5 778392312a85ddd65f81ee8d587d99be)
URL "http://www.paraview.org/files/dependencies/vortexfinder2-f9a31847c052a44cc1e4b592b9e3f3fe078b7bf9.tar.bz2"
URL_MD5 da96a038e00d08e4571f64488e9e4d16)
#------------------------------------------------------------------------------
# Optional Plugins. Doesn't affect ParaView binaries at all even if missing
......
Supports Markdown
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