diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86f988c5..ac5c583e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,14 @@ project( Sapphire )
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
 set( LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
 
+if( WIN32 )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+  set( VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
+endif()
+
 set( CMAKE_MODULE_PATH
        ${CMAKE_MODULE_PATH}
        ${CMAKE_SOURCE_DIR}/cmake )
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index da694d09..8bfaf4b2 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -7,19 +7,13 @@ else()
   add_definitions( -DNOMINMAX )
       
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHc" )
+  message( STATUS "Enabling Build with Multiple Processes.." )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP" )
   set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj" )
   set( CMAKE_CXX_STANDARD 17 )
   set( CMAKE_CXX_STANDARD_REQUIRED ON )
   set( CMAKE_CXX_EXTENSIONS ON )
 
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
-  set( CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
-
-  set( VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin/" )
-
   if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
     # disabling SAFESEH
     message( STATUS "Disabling Safe Exception Handlers.." )
@@ -32,10 +26,6 @@ else()
     # incremental linking
     message( STATUS "Enabling Incremental Linking.." )
     set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL" )
-
-    # enable building with multiple processes
-    message( STATUS "Enabling Build with Multiple Processes.." )
-    add_definitions( /MP )
   endif()
 endif()