diff --git a/cmake_modules/morse/find/FindCBLAS.cmake b/cmake_modules/morse/find/FindCBLAS.cmake
index 748651359cc2c22c48ac5cd9d0172643b0081d35..534effce8505a033e0922895ebb831d4bfa538aa 100644
--- a/cmake_modules/morse/find/FindCBLAS.cmake
+++ b/cmake_modules/morse/find/FindCBLAS.cmake
@@ -62,7 +62,7 @@ endif()
# try to find it specified as COMPONENTS during the call
if (CBLAS_FIND_COMPONENTS)
foreach( component ${CBLAS_FIND_COMPONENTS} )
- if(${CBLAS_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(CBLAS_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
diff --git a/cmake_modules/morse/find/FindCHAMELEON.cmake b/cmake_modules/morse/find/FindCHAMELEON.cmake
index 98abd1387781f35d6b310677a2d595b10ca1b348..78607b2b5189ddb954eb2f18465a1d9fc078ff03 100644
--- a/cmake_modules/morse/find/FindCHAMELEON.cmake
+++ b/cmake_modules/morse/find/FindCHAMELEON.cmake
@@ -58,7 +58,7 @@ endif()
# Try to find CHAMELEON dependencies if specified as COMPONENTS during the call
if( CHAMELEON_FIND_COMPONENTS )
foreach( component ${CHAMELEON_FIND_COMPONENTS} )
- if(${CHAMELEON_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(CHAMELEON_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
@@ -105,7 +105,7 @@ if(PKG_CONFIG_EXECUTABLE)
endif()
endif()
- if (CHAMELEON_FIND_VERSION_EXACT STREQUAL 1)
+ if (CHAMELEON_FIND_VERSION_EXACT)
if( NOT (CHAMELEON_FIND_VERSION_MAJOR STREQUAL CHAMELEON_VERSION_MAJOR) OR
NOT (CHAMELEON_FIND_VERSION_MINOR STREQUAL CHAMELEON_VERSION_MINOR) )
if(NOT CHAMELEON_FIND_QUIETLY)
@@ -278,12 +278,12 @@ if(NOT CHAMELEON_FOUND OR NOT CHAMELEON_LIBRARIES)
set(MPI_C_COMPILER mpicc)
endif()
if (CHAMELEON_FIND_REQUIRED_MPI)
- if(${CHAMELEON_FIND_REQUIRED_MPI} STREQUAL 1)
+ if(CHAMELEON_FIND_REQUIRED_MPI)
list(APPEND STARPU_COMPONENT_LIST "MPI")
endif()
endif()
if (CHAMELEON_FIND_REQUIRED_CUDA)
- if(${CHAMELEON_FIND_REQUIRED_CUDA} STREQUAL 1)
+ if(CHAMELEON_FIND_REQUIRED_CUDA)
list(APPEND STARPU_COMPONENT_LIST "CUDA")
endif()
endif()
diff --git a/cmake_modules/morse/find/FindLAPACKE.cmake b/cmake_modules/morse/find/FindLAPACKE.cmake
index fe79fc8f0c3d62c0e8f0fcb45106dc1702afc08d..3a4a29c96557fa744fa56edaa2d18a0d158b6329 100644
--- a/cmake_modules/morse/find/FindLAPACKE.cmake
+++ b/cmake_modules/morse/find/FindLAPACKE.cmake
@@ -60,7 +60,7 @@ endif()
# try to find it specified as COMPONENTS during the call
if (LAPACKE_FIND_COMPONENTS)
foreach( component ${LAPACKE_FIND_COMPONENTS} )
- if(${LAPACKE_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(LAPACKE_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
diff --git a/cmake_modules/morse/find/FindMAGMA.cmake b/cmake_modules/morse/find/FindMAGMA.cmake
index 2ea5d48a8bed0adaecef0f07df814c9e63883379..d1bcddcc893bd175c9a445087d9e1a985018967c 100644
--- a/cmake_modules/morse/find/FindMAGMA.cmake
+++ b/cmake_modules/morse/find/FindMAGMA.cmake
@@ -55,7 +55,7 @@ endif(NOT MAGMA_FOUND)
# try to find it specified as COMPONENTS during the call
if( MAGMA_FIND_COMPONENTS )
foreach( component ${MAGMA_FIND_COMPONENTS} )
- if(${MAGMA_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(MAGMA_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
@@ -130,7 +130,7 @@ if(PKG_CONFIG_EXECUTABLE)
endif()
endif()
- if (MAGMA_FIND_VERSION_EXACT STREQUAL 1)
+ if (MAGMA_FIND_VERSION_EXACT)
if( NOT (MAGMA_FIND_VERSION_MAJOR STREQUAL MAGMA_VERSION_MAJOR) OR
NOT (MAGMA_FIND_VERSION_MINOR STREQUAL MAGMA_VERSION_MINOR) )
if(NOT MAGMA_FIND_QUIETLY)
diff --git a/cmake_modules/morse/find/FindPARMETIS.cmake b/cmake_modules/morse/find/FindPARMETIS.cmake
index f599725ce757604b63103d02b52037b626d2b1bd..44a6f847e91826d4299ff22bc0483a1f0a219f7e 100644
--- a/cmake_modules/morse/find/FindPARMETIS.cmake
+++ b/cmake_modules/morse/find/FindPARMETIS.cmake
@@ -54,7 +54,7 @@ endif()
# try to find it specified as COMPONENTS during the call
if( PARMETIS_FIND_COMPONENTS )
foreach( component ${PARMETIS_FIND_COMPONENTS} )
- if(${PARMETIS_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(PARMETIS_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
diff --git a/cmake_modules/morse/find/FindPASTIX.cmake b/cmake_modules/morse/find/FindPASTIX.cmake
index c42553d7507fe2d6cec34a731acf4df5a51a9fca..00eab7efd75aa10f4bc8e08f2cb8232de4629cc8 100644
--- a/cmake_modules/morse/find/FindPASTIX.cmake
+++ b/cmake_modules/morse/find/FindPASTIX.cmake
@@ -60,7 +60,7 @@ endif()
# Try to find PASTIX dependencies if specified as COMPONENTS during the call
if( PASTIX_FIND_COMPONENTS )
foreach( component ${PASTIX_FIND_COMPONENTS} )
- if(${PASTIX_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(PASTIX_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
@@ -107,7 +107,7 @@ if(PKG_CONFIG_EXECUTABLE)
endif()
endif()
- if (PASTIX_FIND_VERSION_EXACT STREQUAL 1)
+ if (PASTIX_FIND_VERSION_EXACT)
if( NOT (PASTIX_FIND_VERSION_MAJOR STREQUAL PASTIX_VERSION_MAJOR) OR
NOT (PASTIX_FIND_VERSION_MINOR STREQUAL PASTIX_VERSION_MINOR) )
if(NOT PASTIX_FIND_QUIETLY)
@@ -278,12 +278,12 @@ if(NOT PASTIX_FOUND OR NOT PASTIX_LIBRARIES)
set(MPI_C_COMPILER mpicc)
endif()
if (PASTIX_FIND_REQUIRED_MPI)
- if(${PASTIX_FIND_REQUIRED_MPI} STREQUAL 1)
+ if(PASTIX_FIND_REQUIRED_MPI)
list(APPEND STARPU_COMPONENT_LIST "MPI")
endif()
endif()
if (PASTIX_FIND_REQUIRED_CUDA)
- if(${PASTIX_FIND_REQUIRED_CUDA} STREQUAL 1)
+ if(PASTIX_FIND_REQUIRED_CUDA)
list(APPEND STARPU_COMPONENT_LIST "CUDA")
endif()
endif()
diff --git a/cmake_modules/morse/find/FindPTSCOTCH.cmake b/cmake_modules/morse/find/FindPTSCOTCH.cmake
index edda370906325c517a8d6980f142fbc77f6be63f..10ab86564f45bc3f410cdfa2822cd2f3bb99daed 100644
--- a/cmake_modules/morse/find/FindPTSCOTCH.cmake
+++ b/cmake_modules/morse/find/FindPTSCOTCH.cmake
@@ -55,7 +55,7 @@ endif()
# try to find it specified as COMPONENTS during the call
if( PTSCOTCH_FIND_COMPONENTS )
foreach( component ${PTSCOTCH_FIND_COMPONENTS} )
- if(${PTSCOTCH_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(PTSCOTCH_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
diff --git a/cmake_modules/morse/find/FindQUARK.cmake b/cmake_modules/morse/find/FindQUARK.cmake
index 59757448e209e7d7bae5902a197165cd1a5a825e..379c52ad64a3517e0eee8ae47308e6fd519df67c 100644
--- a/cmake_modules/morse/find/FindQUARK.cmake
+++ b/cmake_modules/morse/find/FindQUARK.cmake
@@ -55,7 +55,7 @@ endif()
# try to find it specified as COMPONENTS during the call
if( QUARK_FIND_COMPONENTS )
foreach( component ${QUARK_FIND_COMPONENTS} )
- if(${QUARK_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(QUARK_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
diff --git a/cmake_modules/morse/find/FindSCOTCH.cmake b/cmake_modules/morse/find/FindSCOTCH.cmake
index 0fdee25dd5482cbe2854d944621e285bcfef64e9..0a6af6c1fc154b7f3d734b75e9c5169d06d44a8a 100644
--- a/cmake_modules/morse/find/FindSCOTCH.cmake
+++ b/cmake_modules/morse/find/FindSCOTCH.cmake
@@ -55,7 +55,7 @@ endif()
# try to find it specified as COMPONENTS during the call
if( SCOTCH_FIND_COMPONENTS )
foreach( component ${SCOTCH_FIND_COMPONENTS} )
- if(${SCOTCH_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(SCOTCH_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
diff --git a/cmake_modules/morse/find/FindSTARPU.cmake b/cmake_modules/morse/find/FindSTARPU.cmake
index 376ee95f3777032dd233d69dba87c9c8a04daf35..5b7b184d8918e47e33480294e2e7c8131cb39469 100644
--- a/cmake_modules/morse/find/FindSTARPU.cmake
+++ b/cmake_modules/morse/find/FindSTARPU.cmake
@@ -74,7 +74,7 @@ if( STARPU_FIND_COMPONENTS )
elseif(${component} STREQUAL "MAGMA")
set(STARPU_LOOK_FOR_MAGMA TRUE)
endif()
- if(${STARPU_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(STARPU_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})
@@ -157,7 +157,7 @@ if(PKG_CONFIG_EXECUTABLE)
endif()
endif()
- if (STARPU_FIND_VERSION_EXACT STREQUAL 1)
+ if (STARPU_FIND_VERSION_EXACT)
if( NOT (STARPU_FIND_VERSION_MAJOR STREQUAL STARPU_VERSION_MAJOR) OR
NOT (STARPU_FIND_VERSION_MINOR STREQUAL STARPU_VERSION_MINOR) )
if(STARPU_FIND_REQUIRED AND NOT STARPU_FIND_QUIETLY)
@@ -277,7 +277,7 @@ if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR
if (STARPU_starpu_config.h_INCLUDE_DIRS)
GET_VERSION("STARPU" "${STARPU_starpu_config.h_INCLUDE_DIRS}/starpu_config.h")
if (STARPU_VERSION_MAJOR AND STARPU_VERSION_MINOR)
- if (STARPU_FIND_VERSION_EXACT STREQUAL 1)
+ if (STARPU_FIND_VERSION_EXACT)
if (STARPU_FIND_VERSION_MAJOR AND STARPU_FIND_VERSION_MINOR)
if( NOT (STARPU_FIND_VERSION_MAJOR STREQUAL STARPU_VERSION_MAJOR) OR
NOT (STARPU_FIND_VERSION_MINOR STREQUAL STARPU_VERSION_MINOR) )
@@ -368,7 +368,7 @@ if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR
message(STATUS "Looking for starpu -- ${starpu_hdr} not found")
endif()
if(starpu_hdr STREQUAL "starpu_mpi.h")
- if(NOT ${STARPU_FIND_REQUIRED_MPI} STREQUAL 1)
+ if(NOT STARPU_FIND_REQUIRED_MPI)
if (NOT STARPU_FIND_QUIETLY)
message(STATUS "Looking for starpu -- ${starpu_hdr} not required")
endif()
@@ -376,7 +376,7 @@ if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR
list(APPEND STARPU_INCLUDE_DIRS "${STARPU_${starpu_hdr}_INCLUDE_DIRS}" )
endif()
elseif( (starpu_hdr STREQUAL "starpu_cuda.h") OR (starpu_hdr STREQUAL "starpu_scheduler.h") )
- if(NOT ${STARPU_FIND_REQUIRED_CUDA} STREQUAL 1)
+ if(NOT STARPU_FIND_REQUIRED_CUDA)
if (NOT STARPU_FIND_QUIETLY)
message(STATUS "Looking for starpu -- ${starpu_hdr} not required")
endif()
@@ -496,7 +496,7 @@ if( (NOT STARPU_SHM_FOUND) OR (NOT STARPU_SHM_LIBRARIES) OR
message(STATUS "Looking for starpu -- lib ${starpu_lib} not found")
endif()
if(starpu_lib STREQUAL "starpumpi-${STARPU_VERSION_STRING}" AND
- NOT ${STARPU_FIND_REQUIRED_MPI} STREQUAL 1)
+ NOT STARPU_FIND_REQUIRED_MPI)
# if MPI optional, not a problem: no NOTFOUND in list of MPI LIBRARIES
if(NOT STARPU_FIND_QUIETLY)
message(STATUS "Looking for starpu -- lib ${starpu_lib} not required")
diff --git a/cmake_modules/morse/find/FindTMG.cmake b/cmake_modules/morse/find/FindTMG.cmake
index 3b3f532d23763bec62ddb8aca2733a9ea53d6507..1ae899dc2734266e4110bde6584fa34aca49dab2 100644
--- a/cmake_modules/morse/find/FindTMG.cmake
+++ b/cmake_modules/morse/find/FindTMG.cmake
@@ -64,7 +64,7 @@ endif (NOT _LANGUAGES_ MATCHES Fortran)
# try to find it specified as COMPONENTS during the call
if (TMG_FIND_COMPONENTS)
foreach( component ${TMG_FIND_COMPONENTS} )
- if(${TMG_FIND_REQUIRED_${component}} STREQUAL 1)
+ if(TMG_FIND_REQUIRED_${component})
find_package(${component} REQUIRED)
else()
find_package(${component})