diff --git a/BPTCEncoder/CMakeLists.txt b/BPTCEncoder/CMakeLists.txt
index 0fd10c8..d56eee6 100644
--- a/BPTCEncoder/CMakeLists.txt
+++ b/BPTCEncoder/CMakeLists.txt
@@ -145,7 +145,13 @@ IF( NOT HAS_INLINE_ASSEMBLY AND NOT HAS_INLINE_ASSEMBLY_WITH_FLAGS )
 ENDIF()
 
 # Check to see whether or not our compiler supports atomic operations
-IF( CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX )
+IF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" )
+  SET( COMPILER_CLANG True )
+ELSEIF( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" )
+  SET( COMPILER_GNU True )
+ENDIF()
+
+IF( COMPILER_CLANG OR COMPILER_GNU )
 
   CHECK_CXX_SOURCE_RUNS("
     int main() {