From 19a4e158e2a4b3d332fddc1e188730364e16e856 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 27 Jan 2020 16:08:54 +0100 Subject: [PATCH] CONFIG: increase cmake requirement for build - building paraview-5.7 and later requires cmake >= 3.10 itself but cmake-3.8 appears to work adequately for building dependent components - use VERSION_GREATER_EQUAL instead of GREATER_EQUAL --- src/catalyst/CMakeLists-Project.txt | 2 +- src/catalyst/CMakeLists.txt | 6 +++--- src/paraview-plugins/blockMeshReader/CMakeLists.txt | 8 ++++---- src/paraview-plugins/foamReader/CMakeLists.txt | 8 ++++---- src/runTimePostProcessing/CMakeLists-Project.txt | 2 +- src/runTimePostProcessing/CMakeLists.txt | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/catalyst/CMakeLists-Project.txt b/src/catalyst/CMakeLists-Project.txt index 0ac6612..344c57f 100644 --- a/src/catalyst/CMakeLists-Project.txt +++ b/src/catalyst/CMakeLists-Project.txt @@ -12,7 +12,7 @@ if (${ParaView_VERSION} LESS 5.6) message(WARNING "==== CAUTION: Catalyst without chdir capability ====") endif() -if (${ParaView_VERSION} GREATER_EQUAL 5.7) +if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) if (TARGET "VTK::ParallelMPI") set(FOAM_USING_VTK_MPI TRUE) endif() diff --git a/src/catalyst/CMakeLists.txt b/src/catalyst/CMakeLists.txt index b492ed2..ce82bd2 100644 --- a/src/catalyst/CMakeLists.txt +++ b/src/catalyst/CMakeLists.txt @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.8) cmake_policy(SET CMP0002 NEW) # For cmake >= 3 cmake_policy(SET CMP0057 NEW) # For cmake >= 3.10.2 @@ -19,7 +19,7 @@ else() endif() # Define pv_api as MAJ.MIN -if (${ParaView_VERSION} GREATER_EQUAL 5.7) +if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) string(REGEX MATCH [0-9]+[.][0-9]+ pv_api ${ParaView_VERSION}) set(pv_version "${ParaView_VERSION}") else() @@ -27,7 +27,7 @@ else() set(pv_version "${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}.${PARAVIEW_VERSION_PATCH}") endif() -if (${ParaView_VERSION} GREATER_EQUAL 5.7) +if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) find_package(ParaView REQUIRED COMPONENTS PythonCatalyst OPTIONAL_COMPONENTS VTK::ParallelMPI) diff --git a/src/paraview-plugins/blockMeshReader/CMakeLists.txt b/src/paraview-plugins/blockMeshReader/CMakeLists.txt index 1259ea1..7ed03d0 100644 --- a/src/paraview-plugins/blockMeshReader/CMakeLists.txt +++ b/src/paraview-plugins/blockMeshReader/CMakeLists.txt @@ -1,5 +1,5 @@ -#----------------------------------------------------------------------------- -cmake_minimum_required(VERSION 2.8) +#------------------------------------------------------------------------------ +cmake_minimum_required(VERSION 3.8) cmake_policy(SET CMP0002 NEW) # For cmake >= 3 cmake_policy(SET CMP0057 NEW) # For cmake >= 3.10.2 @@ -19,7 +19,7 @@ find_package(ParaView REQUIRED) if (DEFINED ENV{PARAVIEW_API}) set(pv_api "$ENV{PARAVIEW_API}") else() - if (${ParaView_VERSION} GREATER_EQUAL 5.7) + if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) string(REGEX MATCH [0-9]+[.][0-9]+ pv_api ${ParaView_VERSION}) message("The PARAVIEW_API env was unset, " "extracted value from version=" @@ -50,7 +50,7 @@ message("OpenFOAM api = ${foam_api}, libs = ${foamPvLibQualifier}") include(CMakeLists-OpenFOAM.txt) -if (${ParaView_VERSION} GREATER_EQUAL 5.7) +if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) message("================") include(CMakeLists-Project57.txt) else() diff --git a/src/paraview-plugins/foamReader/CMakeLists.txt b/src/paraview-plugins/foamReader/CMakeLists.txt index e434f07..7c2cd20 100644 --- a/src/paraview-plugins/foamReader/CMakeLists.txt +++ b/src/paraview-plugins/foamReader/CMakeLists.txt @@ -1,5 +1,5 @@ -#----------------------------------------------------------------------------- -cmake_minimum_required(VERSION 2.8) +#------------------------------------------------------------------------------ +cmake_minimum_required(VERSION 3.8) cmake_policy(SET CMP0002 NEW) # For cmake >= 3 cmake_policy(SET CMP0057 NEW) # For cmake >= 3.10.2 @@ -19,7 +19,7 @@ find_package(ParaView REQUIRED) if (DEFINED ENV{PARAVIEW_API}) set(pv_api "$ENV{PARAVIEW_API}") else() - if (${ParaView_VERSION} GREATER_EQUAL 5.7) + if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) string(REGEX MATCH [0-9]+[.][0-9]+ pv_api ${ParaView_VERSION}) message("The PARAVIEW_API env was unset, " "extracted value from version=" @@ -48,7 +48,7 @@ message("OpenFOAM api = ${foam_api}, libs = ${foamPvLibQualifier}") include(CMakeLists-OpenFOAM.txt) -if (${ParaView_VERSION} GREATER_EQUAL 5.7) +if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) message("================") include(CMakeLists-Project57.txt) else() diff --git a/src/runTimePostProcessing/CMakeLists-Project.txt b/src/runTimePostProcessing/CMakeLists-Project.txt index ae81bec..ece9b32 100644 --- a/src/runTimePostProcessing/CMakeLists-Project.txt +++ b/src/runTimePostProcessing/CMakeLists-Project.txt @@ -13,7 +13,7 @@ unset(FOAM_USING_VTK_MPI) # Test some characteristics -if (${ParaView_VERSION} GREATER_EQUAL 5.7) +if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) if (TARGET "VTK::ParallelMPI") set(FOAM_USING_VTK_MPI TRUE) endif() diff --git a/src/runTimePostProcessing/CMakeLists.txt b/src/runTimePostProcessing/CMakeLists.txt index 9f61447..0113060 100644 --- a/src/runTimePostProcessing/CMakeLists.txt +++ b/src/runTimePostProcessing/CMakeLists.txt @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.8) cmake_policy(SET CMP0002 NEW) # For cmake >= 3 cmake_policy(SET CMP0057 NEW) # For cmake >= 3.10.2 @@ -24,7 +24,7 @@ elseif (EXISTS "$ENV{ParaView_DIR}") message("Building with Paraview from $ENV{ParaView_DIR}") find_package(ParaView REQUIRED) - if (${ParaView_VERSION} GREATER_EQUAL 5.7) + if (${ParaView_VERSION} VERSION_GREATER_EQUAL 5.7) find_package(ParaView REQUIRED OPTIONAL_COMPONENTS VTK::ParallelMPI) endif() -- GitLab