1 files changed, 12 insertions, 4 deletions
diff --git a/src/utilcode/CMakeLists.txt b/src/utilcode/CMakeLists.txt
index e452da8825..117d4790f0 100644
--- a/src/utilcode/CMakeLists.txt
+++ b/src/utilcode/CMakeLists.txt
@@ -82,17 +82,25 @@ if(WIN32)
       lazycow.cpp
     )
   endif()
+  
+  if(NOT DEFINED FEATURE_IMPLICIT_TLS)
+    list(APPEND UTILCODE_SOURCES 
+      tls.cpp
+    )
+  endif(NOT DEFINED FEATURE_IMPLICIT_TLS)
 endif(WIN32)
-
+  
 set(UTILCODE_SOURCES 
   ${UTILCODE_COMMON_SOURCES}
   perflog.cpp
 )
 
 if(WIN32)
-  list(APPEND UTILCODE_SOURCES 
-    tls.cpp
-  )   
+  if(NOT DEFINED FEATURE_IMPLICIT_TLS)
+    list(APPEND UTILCODE_SOURCES 
+      tls.cpp
+    )
+  endif(NOT DEFINED FEATURE_IMPLICIT_TLS)
 endif()
 
 set(UTILCODE_DAC_SOURCES