diff --git a/src/catalyst/CMakeLists-Project.txt b/src/catalyst/CMakeLists-Project.txt index 0ac6612020e7deeb08a558617054a7dbd5733744..344c57ff2d23696ab2c0aa24b80a378d958dfec3 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 b492ed27163350f7e0d64c55c5738ee459a27ec2..ce82bd22fc7393ebf6f8d1a9100f1246104ac7f2 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 1259ea12599d2889c01bade2d6dcfd16e42478cd..7ed03d0343178264f67cccc6109b5573afc32d42 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 e434f07c318ba42bd445df88af509761ad2e57fa..7c2cd202e7f91922f7e78e2eeb2df97835d2a718 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 ae81bec0d733f0a323a14fc73eeacc9780bbff65..ece9b324d7e581da9f263f10870c279cc848635d 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 9f61447abc8dcb263ec5e1b90f7eeada922c7891..01130604ea6d4903ce2af52888b7ce6c4338a438 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()