Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'mk_config'

Browse Source 
e7db8ef72 add build/config to the list of file to be packed for windows
a5f40f7a7 add build/config to the list of file to be packed
c6e06d45b more trial
167afd89d move configure_file after configure_package_config_file
e5338b60e how about the other
6cd30dac9 restore install of vtkm_config.mk
4f699218a temporary disable config files
ecf27e06a Merge branch 'master' into mk_config
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Larsen <larsen30@llnl.gov>
Merge-request: !2536
This commit is contained in:
Li-Ta Lo 2021-08-11 16:19:45 +00:00 committed by Kitware Robot
commit b9f55e5639
5 changed files with 85 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -148,6 +148,7 @@ stages:
- build/include/
- build/vtkm/thirdparty/diy/vtkmdiy/
- build/lib/
- build/config/
# CTest and CMake install files.
# XXX(globbing): Can be simplified with support from

1
.gitlab/ci/windows10.yml
View File

@ -36,6 +36,7 @@
- build/include/
- build/lib/
- build/vtkm/thirdparty/diy/vtkmdiy/include
- build/config/
# CTest and CMake install files.
# XXX(globbing): Can be simplified with support from

13
CMakeLists.txt
View File

@ -212,7 +212,7 @@ if (VTKm_ENABLE_TESTING)
endif()
configure_file(${VTKm_SOURCE_DIR}/CTestCustom.cmake.in
configure_file(CTestCustom.cmake.in
${VTKm_BINARY_DIR}/CTestCustom.cmake @ONLY)
#-----------------------------------------------------------------------------
@ -268,6 +268,17 @@ write_basic_package_version_file(
VERSION ${VTKm_VERSION}
COMPATIBILITY ExactVersion )
configure_file(${VTKm_SOURCE_DIR}/config/vtkm_config.mk.in
${VTKm_BINARY_DIR}/config/vtkm_config.mk @ONLY)
install(FILES ${VTKm_BINARY_DIR}/config/vtkm_config.mk
DESTINATION ${VTKm_INSTALL_SHARE_DIR}
)
configure_file(${VTKm_SOURCE_DIR}/config/vtkm.pc.in
${VTKm_BINARY_DIR}/config/vtkm.pc @ONLY)
install(FILES ${VTKm_BINARY_DIR}/config/vtkm.pc
DESTINATION ${VTKm_INSTALL_SHARE_DIR}
)
include(VTKmInstallCMakePackage)
# Install the readme and license files.

32
config/vtkm.pc.in Normal file
View File

@ -0,0 +1,32 @@
##============================================================================
## Copyright (c) Kitware, Inc.
## All rights reserved.
## See LICENSE.txt for details.
##
## This software is distributed WITHOUT ANY WARRANTY; without even
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information.
##============================================================================
# This file is automatically generated by CMake, do not edit.
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
includedir=${prefix}/include
libdir=${exec_prefix}/lib
Name: VTKm
Description: The VTKm library
Version: @VTKm_VERSION@
Cflags: -I${includedir}/vtkm-@CMAKE_INSTALL_PREFIX@
Libs: -L${libdir} \
-lvtkm_rendering-@VTKm_VERSION@ \
-lvtkm_filter_contour-@VTKm_VERSION@ \
-lvtkm_filter_gradient-@VTKm_VERSION@ \
-lvtkm_filter_extra-@VTKm_VERSION@ \
-lvtkm_filter_common-@VTKm_VERSION@ \
-lvtkm_worklet-@VTKm_VERSION@ \
-lvtkm_source-@VTKm_VERSION@ \
-lvtkm_io-@VTKm_VERSION@ \
-lvtkm_lodepng-@VTKm_VERSION@ \
-lvtkm_cont-@VTKm_VERSION@ \
-lvtkmdiympi_nompi

39
config/vtkm_config.mk.in Normal file
View File

@ -0,0 +1,39 @@
##============================================================================
## Copyright (c) Kitware, Inc.
## All rights reserved.
## See LICENSE.txt for details.
##
## This software is distributed WITHOUT ANY WARRANTY; without even
## the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
## PURPOSE. See the above copyright notice for more information.
##============================================================================
# This file is automatically generated by CMake, do not edit.
VTKm_VERSION = @VTKm_VERSION@
VTKm_DIR = @CMAKE_INSTALL_PREFIX@
VTKm_BUILD_SHARED_LIBS = @VTKm_BUILD_SHARED_LIBS@
VTKm_ENABLE_CUDA = @VTKm_ENABLE_CUDA@
VTKm_ENABLE_KOKKOS = @VTKm_ENABLE_KOKKOS@
VTKm_ENABLE_OPENMP = @VTKm_ENABLE_OPENMP@
VTKm_ENABLE_TBB = @VTKm_ENABLE_TBB@
VTKm_ENABLE_LOGGING = @VTKm_ENABLE_LOGGING@
VTKm_ENABLE_RENDERING = @VTKm_ENABLE_RENDERING@
VTKm_ENABLE_GL_CONTEXT = @VTKm_ENABLE_GL_CONTEXT@
VTKm_ENABLE_OSMESA_CONTEXT = @VTKm_ENABLE_OSMESA_CONTEXT@
VTKm_ENABLE_EGL_CONTEXT = @VTKm_ENABLE_EGL_CONTEXT@
VTKm_ENABLE_MPI = @VTKm_ENABLE_MPI@
VTKm_INCLUDE_FLAGS = -I $(VTKm_DIR)/include
VTKm_LIB_FLAGS = -L $(VTKm_DIR)/lib \
-lvtkm_rendering-$(VTKM_VERSION) \
-lvtkm_filter_contour-$(VTKM_VERSION) \
-lvtkm_filter_gradient-$(VTKM_VERSION) \
-lvtkm_filter_extra-$(VTKM_VERSION) \
-lvtkm_filter_common-$(VTKM_VERSION) \
-lvtkm_worklet-$(VTKM_VERSION) \
-lvtkm_source-$(VTKM_VERSION) \
-lvtkm_io-$(VTKM_VERSION) \
-lvtkm_lodepng-$(VTKM_VERSION) \
-lvtkm_cont-$(VTKM_VERSION) \
-lvtkmdiympi_nompi