From 91a09c8ba2c6aff7ec14c39029d90cc6fdc34c75 Mon Sep 17 00:00:00 2001 From: Robert Maynard Date: Wed, 21 Oct 2015 10:27:21 -0400 Subject: [PATCH] Remove unneeded cmake code from the examples. This is needed as it allows the policies specified in the root of vtk-m to propagate properly to the examples. When CMake sees a cmake_minimum_required command it resets all policy flags. --- examples/clipping/CMakeLists.txt | 7 +------ examples/hello_world/CMakeLists.txt | 4 ---- examples/isosurface/CMakeLists.txt | 5 ----- examples/multi_backend/CMakeLists.txt | 2 -- examples/tetrahedra/CMakeLists.txt | 9 ++------- 5 files changed, 3 insertions(+), 24 deletions(-) diff --git a/examples/clipping/CMakeLists.txt b/examples/clipping/CMakeLists.txt index 7d38a1a86..4c87986dd 100644 --- a/examples/clipping/CMakeLists.txt +++ b/examples/clipping/CMakeLists.txt @@ -20,12 +20,8 @@ ## ##============================================================================= -cmake_minimum_required(VERSION 2.8.11) - - add_executable(Clipping_SERIAL Clipping.cxx) -#target_include_directories(Clipping_SERIAL "") -#target_link_libraries(Clipping_SERIAL "") + set_property( TARGET Clipping_SERIAL APPEND @@ -42,7 +38,6 @@ if(VTKm_Cuda_FOUND) set(CUDA_NVCC_FLAGS ${old_nvcc_flags}) - #target_link_libraries(Clipping_CUDA "") endif() if(VTKm_ENABLE_TBB) diff --git a/examples/hello_world/CMakeLists.txt b/examples/hello_world/CMakeLists.txt index 96a1e1ad1..83425051d 100644 --- a/examples/hello_world/CMakeLists.txt +++ b/examples/hello_world/CMakeLists.txt @@ -20,10 +20,6 @@ ## ##============================================================================= -cmake_minimum_required(VERSION 2.8.11) -find_package(OpenGL) -find_package(GLUT) - if(OPENGL_FOUND AND GLUT_FOUND) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) add_executable(HelloWorld_SERIAL HelloWorld.cxx) diff --git a/examples/isosurface/CMakeLists.txt b/examples/isosurface/CMakeLists.txt index b5ad397b3..027d77ffb 100644 --- a/examples/isosurface/CMakeLists.txt +++ b/examples/isosurface/CMakeLists.txt @@ -20,11 +20,6 @@ ## ##============================================================================= -cmake_minimum_required(VERSION 2.8.11) -find_package(OpenGL) -find_package(GLUT) -find_package(TBB) - if(OPENGL_FOUND AND GLUT_FOUND) add_executable(IsosurfaceUniformGrid_SERIAL IsosurfaceUniformGrid.cxx) target_include_directories(IsosurfaceUniformGrid_SERIAL PRIVATE ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) diff --git a/examples/multi_backend/CMakeLists.txt b/examples/multi_backend/CMakeLists.txt index 82a33fd8d..a8829ba7f 100644 --- a/examples/multi_backend/CMakeLists.txt +++ b/examples/multi_backend/CMakeLists.txt @@ -20,8 +20,6 @@ ## ##============================================================================= -cmake_minimum_required(VERSION 2.8.11) - if(VTKm_Cuda_FOUND) cuda_add_executable(MultiBackend MultiBackend.cu) else() diff --git a/examples/tetrahedra/CMakeLists.txt b/examples/tetrahedra/CMakeLists.txt index 7d4b60754..9b4ae0ecb 100644 --- a/examples/tetrahedra/CMakeLists.txt +++ b/examples/tetrahedra/CMakeLists.txt @@ -20,11 +20,6 @@ ## ##============================================================================= -cmake_minimum_required(VERSION 2.8.11) -find_package(OpenGL) -find_package(GLUT) -find_package(TBB) - if(OPENGL_FOUND AND GLUT_FOUND) add_executable(TetrahedralizeExplicitGrid_SERIAL TetrahedralizeExplicitGrid.cxx) target_include_directories(TetrahedralizeExplicitGrid_SERIAL PRIVATE ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) @@ -37,11 +32,11 @@ if(OPENGL_FOUND AND GLUT_FOUND) add_executable(TetrahedralizeUniformGrid_SERIAL TetrahedralizeUniformGrid.cxx) target_include_directories(TetrahedralizeUniformGrid_SERIAL PRIVATE ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) target_link_libraries(TetrahedralizeUniformGrid_SERIAL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}) - + add_executable(TriangulateUniformGrid_SERIAL TriangulateUniformGrid.cxx) target_include_directories(TriangulateUniformGrid_SERIAL PRIVATE ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) target_link_libraries(TriangulateUniformGrid_SERIAL ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES}) - + if(VTKm_Cuda_FOUND) cuda_add_executable(TetrahedralizeExplicitGrid_CUDA TetrahedralizeExplicitGrid.cu) target_link_libraries(TetrahedralizeExplicitGrid_CUDA ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})