Commit 1feb615b authored by Ben Boeckel's avatar Ben Boeckel
Browse files

genericio, cosmotools: no longer non-free

parent 776b3038
Pipeline #23534 passed with stage
......@@ -59,7 +59,9 @@ function (superbuild_find_projects var)
if (UNIX)
list(APPEND projects
adios
cosmotools
ffmpeg
genericio
libxml2
mxml)
......@@ -85,12 +87,6 @@ function (superbuild_find_projects var)
list(APPEND projects
acusolve
vistrails)
if (UNIX)
list(APPEND projects
cosmotools
genericio)
endif ()
endif ()
if (WIN32)
......
......@@ -4,3 +4,6 @@ superbuild_add_project(genericio
-DBUILD_SHARED_LIBS:BOOL=OFF
-DBUILD_TESTING:BOOL=OFF
-DBUILD_PROGRAMS:BOOL=OFF)
superbuild_apply_patch(genericio add-install-rules
"Add proper install rules")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e299ee6..1dbdc44 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -109,6 +109,47 @@ set(GENERIC_IO_DATA_TESTS_SRC
add_library(GenericIO ${GENERIC_IO_SRC})
set_target_properties(GenericIO PROPERTIES POSITION_INDEPENDENT_CODE True)
target_link_libraries(GenericIO ${MPI_C_LIBRARIES} pthread)
+target_include_directories(GenericIO
+ PUBLIC
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:include>)
+install(
+ TARGETS GenericIO
+ EXPORT GenericIO-targets
+ ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin)
+
+set(genericio_includes
+ BloscCompression.h
+ CRC64.h
+ DataFilter.h
+ GenericIO.h
+ GenericIOBase.h
+ GenericIOCompress.h
+ GenericIODefinitions.hpp
+ GenericIOMPIReader.h
+ GenericIOMPIWriter.h
+ GenericIOPosixReader.h
+ GenericIOReader.h
+ GenericIOUtilities.h
+ GenericIOWriter.h)
+install(
+ FILES ${genericio_includes}
+ DESTINATION "include")
+
+if (WIN32)
+ set(cmakedir cmake)
+else ()
+ set(cmakedir lib/cmake/GenericIO)
+endif ()
+
+install(
+ EXPORT GenericIO-targets
+ DESTINATION ${cmakedir})
+install(
+ FILES "${CMAKE_SOURCE_DIR}/GenericIOConfig.cmake"
+ DESTINATION ${cmakedir})
##------------------------------------------------------------------------------
## Build GenericIO programs
diff --git a/GenericIOConfig.cmake b/GenericIOConfig.cmake
new file mode 100644
index 0000000..e5d945a
--- /dev/null
+++ b/GenericIOConfig.cmake
@@ -0,0 +1,4 @@
+include("${CMAKE_CURRENT_LIST_DIR}/GenericIO-targets.cmake")
+
+include(CMakeFindDependencyMacro)
+find_dependency(MPI)
......@@ -83,12 +83,6 @@ set(PARAVIEW_EXTERNAL_PROJECTS ""
CACHE STRING "A list of projects for ParaView to depend on")
mark_as_advanced(PARAVIEW_EXTERNAL_PROJECTS)
set(paraview_extra_depends)
if (USE_NONFREE_COMPONENTS)
list(APPEND paraview_extra_depends
cosmotools)
endif ()
cmake_dependent_option(PARAVIEW_FREEZE_PYTHON "Freeze Python packages and modules into the application" OFF
"python_enabled;NOT WIN32;paraview_enabled" OFF)
......@@ -102,7 +96,7 @@ if (UNIX)
adios ffmpeg libxml2
# For cosmotools
genericio)
genericio cosmotools)
endif ()
if (NOT APPLE)
......@@ -120,7 +114,6 @@ superbuild_add_project(paraview
paraviewusersguide paraviewgettingstartedguide
paraviewtutorial paraviewtutorialdata paraviewweb
${paraview_plugins}
${paraview_extra_depends}
${paraviews_platform_dependencies}
${PARAVIEW_EXTERNAL_PROJECTS}
......
......@@ -33,8 +33,8 @@ superbuild_set_revision(cgns
URL_MD5 442bba32b576f3429cbd086af43fd4ae)
superbuild_set_revision(genericio
GIT_REPOSITORY "https://kwgitlab.kitware.com/paraview/genericio.git"
GIT_TAG origin/master)
URL "http://www.paraview.org/files/dependencies/genericio-master-a15ffc76cfa9f9674f933e8cb5ffc97a97fd7b27.zip"
URL_MD5 daea4ea2076fb6a1b8ccded8e861e1be)
superbuild_set_revision(acusolve
GIT_REPOSITORY "https://kwgitlab.kitware.com/paraview/acusolvereaderplugin.git"
......
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