diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2507777df..e3714b6e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,7 @@ set (DAMASK_INCLUDE_FLAGS "${DAMASK_INCLUDE_FLAGS} ${PETSC_INCLUDES}")
 ###################################################################################################
 # Intel Compiler
 ###################################################################################################
-if ( CMAKE_Fortran_COMPILER_ID  STREQUAL "Intel")
+if ("${CMAKE_Fortran_COMPILER_ID}"  STREQUAL "Intel")
 
   if (OPENMP)
     set (OPENMP_FLAGS "-qopenmp -parallel")
@@ -310,7 +310,7 @@ if ( CMAKE_Fortran_COMPILER_ID  STREQUAL "Intel")
 ###################################################################################################
 # GNU Compiler
 ###################################################################################################
-elseif( CMAKE_Fortran_COMPILER_ID  STREQUAL "GNU")
+elseif("${CMAKE_Fortran_COMPILER_ID}"  STREQUAL "GNU")
 
   if (OPENMP)
     set (OPENMP_FLAGS "-fopenmp")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e5865b829..656f3edd4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # special flags for some files
-if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
+if ("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
     SET_SOURCE_FILES_PROPERTIES( "lattice.f90" PROPERTIES
                                 COMPILE_FLAGS "-ffree-line-length-240")
     # long lines for interaction matrix