diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3e3456ee1..5b1eff6b06 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,23 +293,31 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TL)
 
 set(DEBUG FALSE)
 
-if (CMAKE_BUILD_TYPE_TL MATCHES debug)
-  set(DEBUG TRUE)
-  set(WIN_RELEASE_TYPE Debug)
-  set(WIN_GYP_RELEASE_TYPE Debug)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
-elseif (CMAKE_BUILD_TYPE_TL MATCHES relwithdebinfo)
-  set(WIN_RELEASE_TYPE RelWithDebInfo)
-  set(WIN_GYP_RELEASE_TYPE release)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -g")
-elseif (CMAKE_BUILD_TYPE_TL MATCHES release)
-  set(WIN_RELEASE_TYPE Release)
-  set(WIN_GYP_RELEASE_TYPE release)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
-endif () 
+if (WINDOWS)
+  if (CMAKE_BUILD_TYPE_TL MATCHES debug)
+    set(DEBUG TRUE)
+    set(WIN_RELEASE_TYPE Debug)
+    set(WIN_GYP_RELEASE_TYPE Debug)
+  elseif (CMAKE_BUILD_TYPE_TL MATCHES relwithdebinfo)
+    set(WIN_RELEASE_TYPE RelWithDebInfo)
+    set(WIN_GYP_RELEASE_TYPE release)
+  elseif (CMAKE_BUILD_TYPE_TL MATCHES release)
+    set(WIN_RELEASE_TYPE Release)
+    set(WIN_GYP_RELEASE_TYPE release)
+  endif () 
+else ()
+  if (CMAKE_BUILD_TYPE_TL MATCHES debug)
+    set(DEBUG TRUE)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g")
+  elseif (CMAKE_BUILD_TYPE_TL MATCHES relwithdebinfo)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -g")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -g")
+  elseif (CMAKE_BUILD_TYPE_TL MATCHES release)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+  endif () 
+endif ()
 
 ################################################################################
 ## TARGET ARCHITECTURE
@@ -443,6 +451,15 @@ if (WINDOWS)
   add_definitions("-D_CRT_SECURE_NO_WARNINGS=1")
 endif ()
 
+################################################################################
+## REGEX
+################################################################################
+
+if (WINDOWS)
+  include_directories(${REGEX_INCLUDE_DIR})
+  add_definitions("-D_CRT_SECURE_NO_WARNINGS=1")
+endif ()
+
 ################################################################################
 ## BOOST
 ################################################################################