Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

fix conflicted checkin

Browse Source
This commit is contained in:
Dave Pugmire 2015-01-28 09:28:01 -05:00
parent cf006085b4
commit 62f243e819
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -130,17 +130,12 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/vtkm/internal/Configure.h.in
vtkm_install_headers(
vtkm/internal ${CMAKE_CURRENT_BINARY_DIR}/vtkm/internal/Configure.h)
<<<<<<< HEAD
find_package(Pyexpander)
=======
# List of Boost features used:
# * Smart Ptr
# * Meta programming language
find_package(BoostHeaders ${VTKm_REQUIRED_BOOST_VERSION} REQUIRED)
#####find_package(Pyexpander)
>>>>>>> f0c9879296bddaca59d42aaeb9d0ef7423f1457a
#-----------------------------------------------------------------------------
# Add subdirectories