diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9fe181cdb..650666bcf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,15 +23,7 @@ IF(VERSION_SUFFIX)
 	SET (VERSION "${VERSION}-${VERSION_SUFFIX}")
 ENDIF(VERSION_SUFFIX)
 ADD_DEFINITIONS(-D'LMMS_VERSION="${VERSION}"')
-IF(WIN32)
-	SET(LMMS_BUILD_WIN32 1)
-ELSE(WIN32)
-	IF(APPLE)
-		SET(LMMS_BUILD_APPLE 1)
-	ELSE(APPLE)
-		SET(LMMS_BUILD_LINUX 1)
-	ENDIF(APPLE)
-ENDIF(WIN32)
+
 
 INCLUDE(DetectMachine)
 
@@ -69,22 +61,6 @@ ELSE(LMMS_BUILD_WIN32)
 ENDIF(LMMS_BUILD_WIN32)
 
 
-IF(LMMS_HOST_X86_64)
-	SET(LIB_DIR lib64)
-ELSE(LMMS_HOST_X86_64)
-	SET(LIB_DIR lib)
-ENDIF(LMMS_HOST_X86_64)
-
-IF(LMMS_BUILD_WIN32)
-	SET(PLUGIN_DIR plugins)
-	SET(DATA_DIR data)
-	SET(LMMS_DATA_DIR data)
-ELSE(LMMS_BUILD_WIN32)
-	SET(PLUGIN_DIR ${LIB_DIR}/lmms)
-	SET(DATA_DIR share)
-	SET(LMMS_DATA_DIR ${DATA_DIR}/lmms)
-ENDIF(LMMS_BUILD_WIN32)
-
 
 CHECK_INCLUDE_FILES(stdint.h LMMS_HAVE_STDINT_H)
 CHECK_INCLUDE_FILES(stdlib.h LMMS_HAVE_STDLIB_H)
diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
index b794b06db..7ac539d21 100644
--- a/cmake/modules/DetectMachine.cmake
+++ b/cmake/modules/DetectMachine.cmake
@@ -1,3 +1,13 @@
+IF(WIN32)
+	SET(LMMS_BUILD_WIN32 1)
+ELSE(WIN32)
+	IF(APPLE)
+		SET(LMMS_BUILD_APPLE 1)
+	ELSE(APPLE)
+		SET(LMMS_BUILD_LINUX 1)
+	ENDIF(APPLE)
+ENDIF(WIN32)
+
 MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
 EXEC_PROGRAM( uname ARGS "-m" OUTPUT_VARIABLE Machine )
 MESSAGE("Machine: ${Machine}")
@@ -16,3 +26,20 @@ ELSE(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" )
 	ENDIF(${Machine} MATCHES "x86_64")
 ENDIF(${Machine} MATCHES "i686" OR ${Machine} MATCHES "i386" )
 
+IF(LMMS_HOST_X86_64)
+	SET(LIB_DIR lib64)
+ELSE(LMMS_HOST_X86_64)
+	SET(LIB_DIR lib)
+ENDIF(LMMS_HOST_X86_64)
+
+IF(LMMS_BUILD_WIN32)
+	SET(PLUGIN_DIR plugins)
+	SET(DATA_DIR data)
+	SET(LMMS_DATA_DIR data)
+ELSE(LMMS_BUILD_WIN32)
+	SET(PLUGIN_DIR ${LIB_DIR}/lmms)
+	SET(DATA_DIR share)
+	SET(LMMS_DATA_DIR ${DATA_DIR}/lmms)
+ENDIF(LMMS_BUILD_WIN32)
+
+