diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdd7d0b..3b119ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,7 +202,7 @@ endif ()
 # Everything should be valid from here onwards.
 if (OPENCMISS_SETUP_TYPE STREQUAL "standard" AND NOT OPENCMISS_INDEPENDENT)
     set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_ROOT}/src/manage")
-    set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_ROOT}/build/manage${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
+    set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_ROOT}/build/manage/${CMAKE_SYSTEM_NAME}${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
     set(OPENCMISS_CMAKE_MODULES_SOURCE_DIR "${OPENCMISS_ROOT}/src/cmake_modules")
     set(OPENCMISS_CMAKE_MODULES_BINARY_DIR "${OPENCMISS_ROOT}/build/cmake_modules${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
     set(OPENCMISS_CMAKE_MODULE_PATH "${OPENCMISS_ROOT}/install/share/cmake/Modules")
@@ -226,13 +226,13 @@ elseif (OPENCMISS_SETUP_TYPE STREQUAL "dependencies" AND OPENCMISS_INDEPENDENT)
     set(OPENCMISS_CMAKE_MODULE_PATH "${OPENCMISS_CMAKE_MODULES_ROOT}/install/share/cmake/Modules")
 elseif (OPENCMISS_SETUP_TYPE STREQUAL "dependencies" AND NOT OPENCMISS_INDEPENDENT)
     set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/src/manage")
-    set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/build/manage${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
+    set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/build/manage/${CMAKE_SYSTEM_NAME}${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
     set(OPENCMISS_CMAKE_MODULES_SOURCE_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/src/cmake_modules")
     set(OPENCMISS_CMAKE_MODULES_BINARY_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/build/cmake_modules${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
     set(OPENCMISS_CMAKE_MODULE_PATH "${OPENCMISS_DEPENDENCIES_ROOT}/install/share/cmake/Modules")
 elseif (OPENCMISS_SETUP_TYPE STREQUAL "libraries" AND NOT OPENCMISS_INDEPENDENT)
     set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_LIBRARIES_ROOT}/src/manage")
-    set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_LIBRARIES_ROOT}/build/manage${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
+    set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_LIBRARIES_ROOT}/build/manage/${CMAKE_SYSTEM_NAME}${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
 elseif (OPENCMISS_SETUP_TYPE STREQUAL "libraries" AND OPENCMISS_INDEPENDENT)
     set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_MANAGE_ROOT}/src")
     set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_MANAGE_ROOT}/build${SINGLE_ARCHITECUTRE_BUILD_TYPE}")