diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
index bcd74ff9cc1..626f6c8f924 100644
--- a/CMake/CMakeLists.txt
+++ b/CMake/CMakeLists.txt
@@ -22,7 +22,6 @@ endif()
 set(INST_FILES
   Packages/FindRapidjson.cmake
   Packages/FindRemotery.cmake
-  Packages/FindSDL2.cmake
   Packages/FindOGRE.cmake
   Utils/FindPkgMacros.cmake
   Utils/MacroLogFeature.cmake
diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
index cd32ae35f88..52e31d5c38e 100644
--- a/CMake/ConfigureBuild.cmake
+++ b/CMake/ConfigureBuild.cmake
@@ -222,14 +222,14 @@ else ()
 endif()
 
 # generate OgreBuildSettings.h
-configure_file(${OGRE_TEMPLATES_DIR}/OgreBuildSettings.h.in ${OGRE_BINARY_DIR}/include/OgreBuildSettings.h @ONLY)
-configure_file(${OGRE_TEMPLATES_DIR}/OgreGL3PlusBuildSettings.h.in ${OGRE_BINARY_DIR}/include/OgreGL3PlusBuildSettings.h @ONLY)
-configure_file(${OGRE_TEMPLATES_DIR}/OgreVulkanBuildSettings.h.in ${OGRE_BINARY_DIR}/include/OgreVulkanBuildSettings.h @ONLY)
+configure_file(${OGRE_TEMPLATES_DIR}/OgreBuildSettings.h.in ${PROJECT_BINARY_DIR}/include/OgreBuildSettings.h @ONLY)
+configure_file(${OGRE_TEMPLATES_DIR}/OgreGL3PlusBuildSettings.h.in ${PROJECT_BINARY_DIR}/include/OgreGL3PlusBuildSettings.h @ONLY)
+configure_file(${OGRE_TEMPLATES_DIR}/OgreVulkanBuildSettings.h.in ${PROJECT_BINARY_DIR}/include/OgreVulkanBuildSettings.h @ONLY)
 
 install( FILES
-	${OGRE_BINARY_DIR}/include/OgreBuildSettings.h
-	${OGRE_BINARY_DIR}/include/OgreGL3PlusBuildSettings.h
-	${OGRE_BINARY_DIR}/include/OgreVulkanBuildSettings.h
+	${PROJECT_BINARY_DIR}/include/OgreBuildSettings.h
+	${PROJECT_BINARY_DIR}/include/OgreGL3PlusBuildSettings.h
+	${PROJECT_BINARY_DIR}/include/OgreVulkanBuildSettings.h
 	DESTINATION include/${OGRE_NEXT_PREFIX}
 )
 
@@ -260,44 +260,44 @@ if (UNIX)
   if (OGRE_STATIC)
     # there is no pkgconfig file for freeimage, so we need to add that lib manually
     set(OGRE_ADDITIONAL_LIBS "${OGRE_ADDITIONAL_LIBS} -lfreeimage")
-    configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGREStatic.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
   else ()
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc @ONLY)
   endif ()
-  install(FILES ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
+  install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
 
   # configure additional packages
 
   message(STATUS "OGRE_PREFIX_PATH: ${OGRE_PREFIX_PATH}")
 
   if (OGRE_BUILD_COMPONENT_PAGING)
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Paging.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Paging.pc @ONLY)
-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Paging.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Paging.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Paging.pc @ONLY)
+    install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Paging.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
   endif ()
 
   if (OGRE_BUILD_COMPONENT_MESHLODGENERATOR)
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-MeshLodGenerator.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-MeshLodGenerator.pc @ONLY)
-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-MeshLodGenerator.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-MeshLodGenerator.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-MeshLodGenerator.pc @ONLY)
+    install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-MeshLodGenerator.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
   endif ()
 
   if (OGRE_BUILD_COMPONENT_PROPERTY)
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Property.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Property.pc @ONLY)
-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Property.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Property.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Property.pc @ONLY)
+    install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Property.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
   endif ()
 
   if (OGRE_BUILD_COMPONENT_OVERLAY)
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Overlay.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Overlay.pc @ONLY)
-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Overlay.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Overlay.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Overlay.pc @ONLY)
+    install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Overlay.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
   endif ()
 
   if (OGRE_BUILD_COMPONENT_VOLUME)
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Volume.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Volume.pc @ONLY)
-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Volume.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Volume.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Volume.pc @ONLY)
+    install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Volume.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
   endif ()
 
   if (OGRE_BUILD_COMPONENT_HLMS_PBS AND OGRE_BUILD_COMPONENT_HLMS_UNLIT)
-    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Hlms.pc.in ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Hlms.pc @ONLY)
-    install(FILES ${OGRE_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Hlms.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
+    configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Hlms.pc.in ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Hlms.pc @ONLY)
+    install(FILES ${PROJECT_BINARY_DIR}/pkgconfig/${OGRE_NEXT_PREFIX}-Hlms.pc DESTINATION ${OGRE_LIB_DIRECTORY}/pkgconfig)
   endif ()
 
 endif ()
@@ -322,11 +322,11 @@ endif(OGRE_CONFIG_STATIC_LINK_CRT)
 #   set(OGRE_CMAKE_DIR lib/cmake)
 # elseif (APPLE)
 # endif ()
-# configure_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${OGRE_BINARY_DIR}/cmake/OGREConfig.cmake @ONLY)
-# configure_file(${OGRE_TEMPLATES_DIR}/OGREConfigVersion.cmake.in ${OGRE_BINARY_DIR}/cmake/OGREConfigVersion.cmake @ONLY)
+# configure_file(${OGRE_TEMPLATES_DIR}/OGREConfig.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake @ONLY)
+# configure_file(${OGRE_TEMPLATES_DIR}/OGREConfigVersion.cmake.in ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake @ONLY)
 # install(FILES
-#   ${OGRE_BINARY_DIR}/cmake/OGREConfig.cmake
-#   ${OGRE_BINARY_DIR}/cmake/OGREConfigVersion.cmake
+#   ${PROJECT_BINARY_DIR}/cmake/OGREConfig.cmake
+#   ${PROJECT_BINARY_DIR}/cmake/OGREConfigVersion.cmake
 #   DESTINATION ${OGRE_CMAKE_DIR}
 # )
 #
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
index a30d90c1156..46862f089e1 100644
--- a/CMake/Dependencies.cmake
+++ b/CMake/Dependencies.cmake
@@ -21,38 +21,38 @@ if(OGRE_BUILD_PLATFORM_EMSCRIPTEN)
     ${OGRE_DEPENDENCIES_DIR}
     ${EMSCRIPTEN_ROOT_PATH}/system
     ${ENV_OGRE_DEPENDENCIES_DIR}
-    "${OGRE_BINARY_DIR}/EmscriptenDependencies"
-    "${OGRE_SOURCE_DIR}/EmscriptenDependencies"
-    "${OGRE_BINARY_DIR}/../EmscriptenDependencies"
-    "${OGRE_SOURCE_DIR}/../EmscriptenDependencies"
+    "${PROJECT_BINARY_DIR}/EmscriptenDependencies"
+    "${PROJECT_SOURCE_DIR}/EmscriptenDependencies"
+    "${PROJECT_BINARY_DIR}/../EmscriptenDependencies"
+    "${PROJECT_SOURCE_DIR}/../EmscriptenDependencies"
   )
   set(CMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH} ${OGRE_DEP_SEARCH_PATH})
 elseif(OGRE_BUILD_PLATFORM_APPLE_IOS)
   set(OGRE_DEP_SEARCH_PATH 
     ${OGRE_DEPENDENCIES_DIR}
     ${ENV_OGRE_DEPENDENCIES_DIR}
-    "${OGRE_BINARY_DIR}/iOSDependencies"
-    "${OGRE_SOURCE_DIR}/iOSDependencies"
-    "${OGRE_BINARY_DIR}/../iOSDependencies"
-    "${OGRE_SOURCE_DIR}/../iOSDependencies"
+    "${PROJECT_BINARY_DIR}/iOSDependencies"
+    "${PROJECT_SOURCE_DIR}/iOSDependencies"
+    "${PROJECT_BINARY_DIR}/../iOSDependencies"
+    "${PROJECT_SOURCE_DIR}/../iOSDependencies"
   )
 elseif(OGRE_BUILD_PLATFORM_ANDROID)
   set(OGRE_DEP_SEARCH_PATH 
     ${OGRE_DEPENDENCIES_DIR}
     ${ENV_OGRE_DEPENDENCIES_DIR}
-    "${OGRE_BINARY_DIR}/DependenciesAndroid"
-    "${OGRE_SOURCE_DIR}/DependenciesAndroid"
-    "${OGRE_BINARY_DIR}/../DependenciesAndroid"
-    "${OGRE_SOURCE_DIR}/../DependenciesAndroid"
+    "${PROJECT_BINARY_DIR}/DependenciesAndroid"
+    "${PROJECT_SOURCE_DIR}/DependenciesAndroid"
+    "${PROJECT_BINARY_DIR}/../DependenciesAndroid"
+    "${PROJECT_SOURCE_DIR}/../DependenciesAndroid"
   )
 else()
   set(OGRE_DEP_SEARCH_PATH 
     ${OGRE_DEPENDENCIES_DIR}
     ${ENV_OGRE_DEPENDENCIES_DIR}
-    "${OGRE_BINARY_DIR}/Dependencies"
-    "${OGRE_SOURCE_DIR}/Dependencies"
-    "${OGRE_BINARY_DIR}/../Dependencies"
-    "${OGRE_SOURCE_DIR}/../Dependencies"
+    "${PROJECT_BINARY_DIR}/Dependencies"
+    "${PROJECT_SOURCE_DIR}/Dependencies"
+    "${PROJECT_BINARY_DIR}/../Dependencies"
+    "${PROJECT_SOURCE_DIR}/../Dependencies"
   )
 endif()
 
@@ -238,9 +238,9 @@ macro_log_feature(CppUnit_FOUND "CppUnit" "Library for performing unit tests" "h
 # setting everything up, including overriding any of the above
 # findings.
 set(OGREDEPS_RUNTIME_OUTPUT ${OGRE_RUNTIME_OUTPUT})
-if (EXISTS "${OGRE_SOURCE_DIR}/Dependencies/CMakeLists.txt")
+if (EXISTS "${PROJECT_SOURCE_DIR}/Dependencies/CMakeLists.txt")
   add_subdirectory(Dependencies)
-elseif (EXISTS "${OGRE_SOURCE_DIR}/ogredeps/CMakeLists.txt")
+elseif (EXISTS "${PROJECT_SOURCE_DIR}/ogredeps/CMakeLists.txt")
   add_subdirectory(ogredeps)
 endif ()
 
diff --git a/CMake/InstallDependencies.cmake b/CMake/InstallDependencies.cmake
index 5a78e48c448..86e6e46afd5 100644
--- a/CMake/InstallDependencies.cmake
+++ b/CMake/InstallDependencies.cmake
@@ -16,8 +16,6 @@ endif()
 
 # TODO - most of this file assumes a common dependencies root folder
 # This is not robust, we should instead source dependencies from their individual locations
-get_filename_component(OGRE_DEP_DIR ${SDL2_INCLUDE_DIR}/../../ ABSOLUTE)
-
 option(OGRE_INSTALL_DEPENDENCIES "Install dependency libs needed for samples" TRUE)
 option(OGRE_COPY_DEPENDENCIES "Copy dependency libs to the build directory" TRUE)
 
@@ -52,12 +50,12 @@ endmacro()
 macro(copy_debug INPUT)
   if (EXISTS ${OGRE_DEP_DIR}/lib/debug/${INPUT})
     if (MINGW OR NMAKE)
-      configure_file(${OGRE_DEP_DIR}/lib/debug/${INPUT} ${OGRE_BINARY_DIR}/lib/${INPUT} COPYONLY)
+      configure_file(${OGRE_DEP_DIR}/lib/debug/${INPUT} ${PROJECT_BINARY_DIR}/lib/${INPUT} COPYONLY)
 	else ()
       if (IS_DIRECTORY ${OGRE_DEP_DIR}/lib/debug/${INPUT})
         install(DIRECTORY ${OGRE_DEP_DIR}/lib/debug/${INPUT} DESTINATION lib/debug)
       else ()
-        configure_file(${OGRE_DEP_DIR}/lib/debug/${INPUT} ${OGRE_BINARY_DIR}/lib/debug/${INPUT} COPYONLY)
+        configure_file(${OGRE_DEP_DIR}/lib/debug/${INPUT} ${PROJECT_BINARY_DIR}/lib/debug/${INPUT} COPYONLY)
       endif ()
 	endif ()
   endif ()
@@ -66,16 +64,16 @@ endmacro()
 macro(copy_release INPUT)
   if (EXISTS ${OGRE_DEP_DIR}/lib/release/${INPUT})
     if (MINGW OR NMAKE)
-      configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${OGRE_BINARY_DIR}/lib/${INPUT} COPYONLY)
+      configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${PROJECT_BINARY_DIR}/lib/${INPUT} COPYONLY)
 	else ()
       if (IS_DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT})
         install(DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/release CONFIGURATIONS Release None "")
         install(DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/relwithdebinfo CONFIGURATIONS RelWithDebInfo)
         install(DIRECTORY ${OGRE_DEP_DIR}/lib/release/${INPUT} DESTINATION lib/minsizerel CONFIGURATIONS MinSizeRel)
       else ()
-        configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${OGRE_BINARY_DIR}/lib/release/${INPUT} COPYONLY)
-        configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${OGRE_BINARY_DIR}/lib/relwithdebinfo/${INPUT} COPYONLY)
-        configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${OGRE_BINARY_DIR}/lib/minsizerel/${INPUT} COPYONLY)
+        configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${PROJECT_BINARY_DIR}/lib/release/${INPUT} COPYONLY)
+        configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${PROJECT_BINARY_DIR}/lib/relwithdebinfo/${INPUT} COPYONLY)
+        configure_file(${OGRE_DEP_DIR}/lib/release/${INPUT} ${PROJECT_BINARY_DIR}/lib/minsizerel/${INPUT} COPYONLY)
       endif ()
 	endif ()
   endif ()
@@ -138,34 +136,34 @@ if (OGRE_COPY_DEPENDENCIES)
     # copy the required DLLs to the build directory (configure_file is the only copy-like op I found in CMake)
 	if( (OGRE_BUILD_SAMPLES2 OR OGRE_BUILD_TESTS) )
 		if(EXISTS ${SDL2_BINARY_DBG} AND EXISTS ${SDL2_BINARY_REL})
-		  file(COPY ${SDL2_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
-		  file(COPY ${SDL2_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
-		  file(COPY ${SDL2_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
-		  file(COPY ${SDL2_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
+		  file(COPY ${SDL2_BINARY_DBG} DESTINATION ${PROJECT_BINARY_DIR}/bin/debug)
+		  file(COPY ${SDL2_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/release)
+		  file(COPY ${SDL2_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/relwithdebinfo)
+		  file(COPY ${SDL2_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/minsizerel)
 		endif()
 		if(EXISTS ${OpenVR_BINARY_DBG} AND EXISTS ${OpenVR_BINARY_REL})
-		  file(COPY ${OpenVR_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
-		  file(COPY ${OpenVR_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
-		  file(COPY ${OpenVR_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
-		  file(COPY ${OpenVR_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
+		  file(COPY ${OpenVR_BINARY_DBG} DESTINATION ${PROJECT_BINARY_DIR}/bin/debug)
+		  file(COPY ${OpenVR_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/release)
+		  file(COPY ${OpenVR_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/relwithdebinfo)
+		  file(COPY ${OpenVR_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/minsizerel)
 		endif()
 	endif()
 
 	if( OGRE_PROFILING_PROVIDER STREQUAL "remotery" )
 		if(EXISTS ${Remotery_BINARY_DBG} AND EXISTS ${Remotery_BINARY_REL})
-		  file(COPY ${Remotery_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
-		  file(COPY ${Remotery_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
-		  file(COPY ${Remotery_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
-		  file(COPY ${Remotery_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
+		  file(COPY ${Remotery_BINARY_DBG} DESTINATION ${PROJECT_BINARY_DIR}/bin/debug)
+		  file(COPY ${Remotery_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/release)
+		  file(COPY ${Remotery_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/relwithdebinfo)
+		  file(COPY ${Remotery_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/minsizerel)
 		endif()
 	endif()
 
 	if( OGRE_CONFIG_AMD_AGS )
 		if(EXISTS ${AMDAGS_BINARY_DBG} AND EXISTS ${AMDAGS_BINARY_REL})
-		  file(COPY ${AMDAGS_BINARY_DBG} DESTINATION ${OGRE_BINARY_DIR}/bin/debug)
-		  file(COPY ${AMDAGS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/release)
-		  file(COPY ${AMDAGS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/relwithdebinfo)
-		  file(COPY ${AMDAGS_BINARY_REL} DESTINATION ${OGRE_BINARY_DIR}/bin/minsizerel)
+		  file(COPY ${AMDAGS_BINARY_DBG} DESTINATION ${PROJECT_BINARY_DIR}/bin/debug)
+		  file(COPY ${AMDAGS_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/release)
+		  file(COPY ${AMDAGS_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/relwithdebinfo)
+		  file(COPY ${AMDAGS_BINARY_REL} DESTINATION ${PROJECT_BINARY_DIR}/bin/minsizerel)
 		endif()
 	endif()
    
diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
index 0b962867cd0..185a640ffc1 100644
--- a/CMake/InstallResources.cmake
+++ b/CMake/InstallResources.cmake
@@ -118,72 +118,72 @@ endif()
 
 # CREATE CONFIG FILES - INSTALL VERSIONS
 # create resources2.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/resources2.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/resources2.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/debug/resources2.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/release/resources2.cfg)
 # create resources.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/resources_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/resources_d.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/resources.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/resources_d.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/debug/resources_d.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/release/resources.cfg)
 # create plugins.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/release/plugins.cfg)
 # create plugins_tools.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_tools_d.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins_tools.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools_d.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/debug/plugins_tools_d.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/release/plugins_tools.cfg)
 # create tests.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/tests_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/release/tests.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/tests_d.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/debug/tests_d.cfg)
 # create HiddenAreaMeshVr.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/HiddenAreaMeshVr.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/debug/HiddenAreaMeshVr.cfg)
+configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${PROJECT_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg)
 
 # install resource files
 if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
   install(FILES 
-	${OGRE_BINARY_DIR}/inst/bin/debug/HiddenAreaMeshVr.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/debug/resources2.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/debug/resources_d.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_tools_d.cfg
-	${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/debug/HiddenAreaMeshVr.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/debug/resources2.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/debug/resources_d.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/debug/plugins_tools_d.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/debug/tests_d.cfg
     DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug
   )
   install(FILES 
-	${OGRE_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/resources2.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/resources.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
-	${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/resources2.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/resources.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/plugins.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/release/tests.cfg
     DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None ""
   )
   install(FILES 
-	${OGRE_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/resources2.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/resources.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
-	${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/resources2.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/resources.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/plugins.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/release/tests.cfg
 	DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
   )
   install(FILES 
-	${OGRE_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/resources2.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/resources.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
-	${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/resources2.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/resources.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/plugins.cfg
+    ${PROJECT_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
+	${PROJECT_BINARY_DIR}/inst/bin/release/tests.cfg
 	DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
   )
 
   # Need a special case here for the iOS SDK, configuration is not being matched, could be a CMake bug.
   if (OGRE_BUILD_PLATFORM_APPLE_IOS)
     install(FILES 
-	  ${OGRE_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
-      ${OGRE_BINARY_DIR}/inst/bin/release/resources2.cfg
-      ${OGRE_BINARY_DIR}/inst/bin/release/resources.cfg
-      ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
-      ${OGRE_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
-      ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+	  ${PROJECT_BINARY_DIR}/inst/bin/release/HiddenAreaMeshVr.cfg
+      ${PROJECT_BINARY_DIR}/inst/bin/release/resources2.cfg
+      ${PROJECT_BINARY_DIR}/inst/bin/release/resources.cfg
+      ${PROJECT_BINARY_DIR}/inst/bin/release/plugins.cfg
+      ${PROJECT_BINARY_DIR}/inst/bin/release/plugins_tools.cfg
+      ${PROJECT_BINARY_DIR}/inst/bin/release/tests.cfg
       DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}"
     )
   endif()
@@ -194,14 +194,14 @@ endif (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
 # CREATE CONFIG FILES - BUILD DIR VERSIONS
 if (NOT (OGRE_BUILD_PLATFORM_APPLE_IOS OR WINDOWS_STORE OR WINDOWS_PHONE))
 	if( NOT APPLE )
-		set(OGRE_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Samples/Media")
-		set(OGRE_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Samples/Media")
+		set(OGRE_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Samples/Media")
+		set(OGRE_MEDIA_DIR_DBG "${PROJECT_SOURCE_DIR}/Samples/Media")
 	else()
 		set(OGRE_MEDIA_DIR_REL "Contents/Resources")
 		set(OGRE_MEDIA_DIR_DBG "Contents/Resources")
 	endif()
-	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_SOURCE_DIR}/Tests/Media")
-	set(OGRE_TEST_MEDIA_DIR_DBG "${OGRE_SOURCE_DIR}/Tests/Media")
+	set(OGRE_TEST_MEDIA_DIR_REL "${PROJECT_SOURCE_DIR}/Tests/Media")
+	set(OGRE_TEST_MEDIA_DIR_DBG "${PROJECT_SOURCE_DIR}/Tests/Media")
 else ()
 	# iOS needs to use relative paths in the config files
 	set(OGRE_TEST_MEDIA_DIR_REL "${OGRE_MEDIA_PATH}")
@@ -231,59 +231,59 @@ elseif (APPLE)
   set(OGRE_SAMPLES_DIR_REL "")
   set(OGRE_SAMPLES_DIR_DBG "")
 elseif (UNIX)
-  set(OGRE_PLUGIN_DIR_REL "${OGRE_BINARY_DIR}/lib")
-  set(OGRE_PLUGIN_DIR_DBG "${OGRE_BINARY_DIR}/lib")
-  set(OGRE_SAMPLES_DIR_REL "${OGRE_BINARY_DIR}/lib")
-  set(OGRE_SAMPLES_DIR_DBG "${OGRE_BINARY_DIR}/lib")
+  set(OGRE_PLUGIN_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+  set(OGRE_PLUGIN_DIR_DBG "${PROJECT_BINARY_DIR}/lib")
+  set(OGRE_SAMPLES_DIR_REL "${PROJECT_BINARY_DIR}/lib")
+  set(OGRE_SAMPLES_DIR_DBG "${PROJECT_BINARY_DIR}/lib")
 endif ()
 
 if (MSVC AND NOT NMAKE)
   # create resources2.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${OGRE_BINARY_DIR}/bin/debug/resources2.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${OGRE_BINARY_DIR}/bin/release/resources2.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/resources2.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/resources2.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${PROJECT_BINARY_DIR}/bin/debug/resources2.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${PROJECT_BINARY_DIR}/bin/release/resources2.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${PROJECT_BINARY_DIR}/bin/relwithdebinfo/resources2.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${PROJECT_BINARY_DIR}/bin/minsizerel/resources2.cfg)
   # create resources.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/resources_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/resources_d.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/bin/release/resources.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/resources.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/resources.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources_d.cfg.in ${PROJECT_BINARY_DIR}/bin/debug/resources_d.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${PROJECT_BINARY_DIR}/bin/release/resources.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${PROJECT_BINARY_DIR}/bin/relwithdebinfo/resources.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${PROJECT_BINARY_DIR}/bin/minsizerel/resources.cfg)
   # create plugins.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/plugins_d.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${PROJECT_BINARY_DIR}/bin/debug/plugins_d.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${PROJECT_BINARY_DIR}/bin/release/plugins.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${PROJECT_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${PROJECT_BINARY_DIR}/bin/minsizerel/plugins.cfg)
   # create plugins_tools.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/plugins_tools_d.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins_tools.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins_tools.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins_tools.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools_d.cfg.in ${PROJECT_BINARY_DIR}/bin/debug/plugins_tools_d.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${PROJECT_BINARY_DIR}/bin/release/plugins_tools.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${PROJECT_BINARY_DIR}/bin/relwithdebinfo/plugins_tools.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools.cfg.in ${PROJECT_BINARY_DIR}/bin/minsizerel/plugins_tools.cfg)
   # create tests.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/tests_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/tests_d.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${OGRE_BINARY_DIR}/bin/release/tests.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/tests.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/tests.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/tests_d.cfg.in ${PROJECT_BINARY_DIR}/bin/debug/tests_d.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${PROJECT_BINARY_DIR}/bin/release/tests.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${PROJECT_BINARY_DIR}/bin/relwithdebinfo/tests.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/tests.cfg.in ${PROJECT_BINARY_DIR}/bin/minsizerel/tests.cfg)
   # create HiddenAreaMeshVr.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${OGRE_BINARY_DIR}/bin/debug/HiddenAreaMeshVr.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${OGRE_BINARY_DIR}/bin/release/HiddenAreaMeshVr.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/HiddenAreaMeshVr.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/HiddenAreaMeshVr.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${PROJECT_BINARY_DIR}/bin/debug/HiddenAreaMeshVr.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${PROJECT_BINARY_DIR}/bin/release/HiddenAreaMeshVr.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${PROJECT_BINARY_DIR}/bin/relwithdebinfo/HiddenAreaMeshVr.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${PROJECT_BINARY_DIR}/bin/minsizerel/HiddenAreaMeshVr.cfg)
 else() # other OS only need one cfg file
   string(TOLOWER "${CMAKE_BUILD_TYPE}" OGRE_BUILD_TYPE)
   if (OGRE_BUILD_TYPE STREQUAL "debug" AND NOT APPLE)
     set(OGRE_CFG_SUFFIX "_d")
   endif ()
   # create resources2.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${OGRE_BINARY_DIR}/bin/resources2.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources2.cfg.in ${PROJECT_BINARY_DIR}/bin/resources2.cfg)
   # create resources.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${PROJECT_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg)
   # create plugins.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${PROJECT_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg)
   # create plugins_tools.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins_tools${OGRE_CFG_SUFFIX}.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/plugins_tools${OGRE_CFG_SUFFIX}.cfg.in ${PROJECT_BINARY_DIR}/bin/plugins_tools${OGRE_CFG_SUFFIX}.cfg)
   # create tests.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/tests${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/tests${OGRE_CFG_SUFFIX}.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/tests${OGRE_CFG_SUFFIX}.cfg.in ${PROJECT_BINARY_DIR}/bin/tests${OGRE_CFG_SUFFIX}.cfg)
   # create HiddenAreaMeshVr.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${OGRE_BINARY_DIR}/bin/HiddenAreaMeshVr.cfg)
+  configure_file(${OGRE_TEMPLATES_DIR}/HiddenAreaMeshVr.cfg.in ${PROJECT_BINARY_DIR}/bin/HiddenAreaMeshVr.cfg)
 endif ()
 
diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
deleted file mode 100644
index 4b42a51f7e7..00000000000
--- a/CMake/Packages/FindSDL2.cmake
+++ /dev/null
@@ -1,206 +0,0 @@
-# Locate SDL2 library
-# This module defines
-# SDL2_LIBRARY, the name of the library to link against
-# SDL2_FOUND, if false, do not try to link to SDL2
-# SDL2_INCLUDE_DIR, where to find SDL.h
-#
-# This module responds to the the flag:
-# SDL2_BUILDING_LIBRARY
-# If this is defined, then no SDL2_main will be linked in because
-# only applications need main().
-# Otherwise, it is assumed you are building an application and this
-# module will attempt to locate and set the the proper link flags
-# as part of the returned SDL2_LIBRARY variable.
-#
-# Don't forget to include SDL2main.h and SDL2main.m your project for the
-# OS X framework based version. (Other versions link to -lSDL2main which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-# Additional Note: If you see an empty SDL2_LIBRARY_TEMP in your configuration
-# and no SDL2_LIBRARY, it means CMake did not find your SDL2 library
-# (SDL2.dll, libsdl2.so, SDL2.framework, etc).
-# Set SDL2_LIBRARY_TEMP to point to your SDL2 library, and configure again.
-# Similarly, if you see an empty SDL2MAIN_LIBRARY, you should set this value
-# as appropriate. These values are used to generate the final SDL2_LIBRARY
-# variable, but when these values are unset, SDL2_LIBRARY does not get created.
-#
-#
-# $SDL2DIR is an environment variable that would
-# correspond to the ./configure --prefix=$SDL2DIR
-# used in building SDL2.
-# l.e.galup  9-20-02
-#
-# Modified by Eric Wing.
-# Added code to assist with automated building by using environmental variables
-# and providing a more controlled/consistent search behavior.
-# Added new modifications to recognize OS X frameworks and
-# additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL2 guidelines.
-# Added a search for SDL2main which is needed by some platforms.
-# Added a search for threads which is needed by some platforms.
-# Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of
-# SDL2_LIBRARY to override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL2/SDL.h to just SDL.h
-# This needed to change because "proper" SDL2 convention
-# is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
-# reasons because not all systems place things in SDL2/ (see FreeBSD).
-#
-# Ported by Johnny Patterson. This is a literal port for SDL2 of the FindSDL.cmake
-# module with the minor edit of changing "SDL" to "SDL2" where necessary. This
-# was not created for redistribution, and exists temporarily pending official
-# SDL2 CMake modules.
-
-#=============================================================================
-# Copyright 2003-2009 Kitware, Inc.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-
-FIND_PATH(SDL2_INCLUDE_DIR SDL.h
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES include/SDL2 include
-  PATHS
-  ~/Library/Frameworks
-  /Library/Frameworks
-  /usr/local/include/SDL2
-  /usr/include/SDL2
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/csw # Blastwave
-  /opt
-)
-#MESSAGE("SDL2_INCLUDE_DIR is ${SDL2_INCLUDE_DIR}")
-
-FIND_LIBRARY(SDL2_LIBRARY_TEMP
-  NAMES SDL2
-  HINTS
-  $ENV{SDL2DIR}
-  PATH_SUFFIXES lib64 lib lib/${MSVC_CXX_ARCHITECTURE_ID}/Release
-  PATHS
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-#MESSAGE("SDL2_LIBRARY_TEMP is ${SDL2_LIBRARY_TEMP}")
-
-IF(NOT SDL2_BUILDING_LIBRARY)
-  IF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-    # Non-OS X framework versions expect you to also dynamically link to
-    # SDL2main. This is mainly for Windows and OS X. Other (Unix) platforms
-    # seem to provide SDL2main for compatibility even though they don't
-    # necessarily need it.
-    FIND_LIBRARY(SDL2MAIN_LIBRARY
-      NAMES SDL2main
-      HINTS
-      $ENV{SDL2DIR}
-      PATH_SUFFIXES lib64 lib
-      PATHS
-      /sw
-      /opt/local
-      /opt/csw
-      /opt
-    )
-  ENDIF(NOT ${SDL2_INCLUDE_DIR} MATCHES ".framework")
-ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-# SDL2 may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-IF(NOT APPLE)
-  FIND_PACKAGE(Threads)
-ENDIF(NOT APPLE)
-
-# MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDL2main -lSDL2 -lmwindows
-# (Actually on second look, I think it only needs one of the m* libraries.)
-IF(MINGW)
-  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
-ENDIF(MINGW)
-
-SET(SDL2_FOUND "NO")
-IF(SDL2_LIBRARY_TEMP)
-  # For SDL2main
-  IF(NOT SDL2_BUILDING_LIBRARY)
-    IF(SDL2MAIN_LIBRARY)
-      SET(SDL2_LIBRARY_TEMP ${SDL2MAIN_LIBRARY} ${SDL2_LIBRARY_TEMP})
-    ENDIF(SDL2MAIN_LIBRARY)
-  ENDIF(NOT SDL2_BUILDING_LIBRARY)
-
-  # For OS X, SDL2 uses Cocoa as a backend so it must link to Cocoa.
-  # CMake doesn't display the -framework Cocoa string in the UI even
-  # though it actually is there if I modify a pre-used variable.
-  # I think it has something to do with the CACHE STRING.
-  # So I use a temporary variable until the end so I can set the
-  # "real" variable in one-shot.
-  IF(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
-    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} "-framework Cocoa")
-  ENDIF()
-
-  # For threads, as mentioned Apple doesn't need this.
-  # In fact, there seems to be a problem if I used the Threads package
-  # and try using this line, so I'm just skipping it entirely for OS X.
-  IF(NOT APPLE)
-    SET(SDL2_LIBRARY_TEMP ${SDL2_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
-  ENDIF(NOT APPLE)
-
-  # For MinGW library
-  IF(MINGW)
-    SET(SDL2_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL2_LIBRARY_TEMP})
-  ENDIF(MINGW)
-  
-  IF(WIN32 AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
-    SET(SDL2_LIBRARY_TEMP winmm imm32 version msimg32 ${SDL2_LIBRARY_TEMP})
-  ENDIF(WIN32 AND NOT WINDOWS_STORE AND NOT WINDOWS_PHONE)
-
-  # Set the final string here so the GUI reflects the final state.
-  SET(SDL2_LIBRARY ${SDL2_LIBRARY_TEMP} CACHE STRING "Where the SDL2 Library can be found")
-  # Set the temp variable to INTERNAL so it is not seen in the CMake GUI
-  SET(SDL2_LIBRARY_TEMP "${SDL2_LIBRARY_TEMP}" CACHE INTERNAL "")
-
-  SET(SDL2_FOUND "YES")
-ENDIF(SDL2_LIBRARY_TEMP)
-
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
-                                  REQUIRED_VARS SDL2_LIBRARY SDL2_INCLUDE_DIR)
-
-if (WIN32)
-	set(SDL2_BIN_SEARCH_PATH ${OGRE_DEPENDENCIES_DIR}/bin ${CMAKE_SOURCE_DIR}/Dependencies/bin ${SDL2_HOME}/dll
-		${ENV_SDL2_HOME}/dll ${ENV_OGRE_DEPENDENCIES_DIR}/bin
-		${OGRE_SOURCE}/Dependencies/bin ${ENV_OGRE_SOURCE}/Dependencies/bin
-		${OGRE_SDK}/bin ${ENV_OGRE_SDK}/bin
-		${OGRE_HOME}/bin ${ENV_OGRE_HOME}/bin)
-	find_file(SDL2_BINARY_REL NAMES "SDL2.dll" HINTS ${SDL2_BIN_SEARCH_PATH}
-	  PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)
-	find_file(SDL2_BINARY_DBG NAMES "SDL2_d.dll" "SDL2.dll" HINTS ${SDL2_BIN_SEARCH_PATH}
-	  PATH_SUFFIXES "" Debug )
-endif()
-mark_as_advanced(SDL2_BINARY_REL SDL2_BINARY_DBG)
-
-IF(SDL2_STATIC)
-  if (UNIX AND NOT APPLE)
-    EXECUTE_PROCESS(COMMAND sdl2-config --static-libs OUTPUT_VARIABLE SDL2_LINK_FLAGS)
-    STRING(REGEX REPLACE "(\r?\n)+$" "" SDL2_LINK_FLAGS "${SDL2_LINK_FLAGS}")
-    SET(SDL2_LIBRARY ${SDL2_LINK_FLAGS})
-  ENDIF()
-ENDIF(SDL2_STATIC)
diff --git a/CMake/Packaging.cmake b/CMake/Packaging.cmake
index 7a93bd8ed03..0784af10d61 100644
--- a/CMake/Packaging.cmake
+++ b/CMake/Packaging.cmake
@@ -12,7 +12,7 @@ set(CPACK_PACKAGE_VERSION_MAJOR ${OGRE_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${OGRE_VERSION_MINOR})
 set(CPACK_PACKAGE_VERSION_PATCH ${OGRE_VERSION_PATCH})
 
-set(CPACK_INSTALL_CMAKE_PROJECTS "${OGRE_BINARY_DIR}" "OGRE" "ALL" "/")
+set(CPACK_INSTALL_CMAKE_PROJECTS "${PROJECT_BINARY_DIR}" "OGRE" "ALL" "/")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Open Source 3D Graphics Engine")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "OGRE")
 set(CPACK_PACKAGE_NAME "OGRE-Next")
@@ -20,10 +20,10 @@ set(CPACK_PACKAGE_VENDOR "Torus Knot Software")
 
 # CPack won't allow file without recognized extension to be used as
 # license file.
-configure_file("${OGRE_SOURCE_DIR}/COPYING" "${OGRE_BINARY_DIR}/COPYING.txt" COPYONLY)
-set(CPACK_RESOURCE_FILE_LICENSE "${OGRE_BINARY_DIR}/COPYING.txt")
+configure_file("${PROJECT_SOURCE_DIR}/COPYING" "${PROJECT_BINARY_DIR}/COPYING.txt" COPYONLY)
+set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_BINARY_DIR}/COPYING.txt")
 
-#set(CPACK_PACKAGE_ICON "${OGRE_SOURCE_DIR}\\\\ogrelogo.gif")
+#set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}\\\\ogrelogo.gif")
 
 set(CPACK_PACKAGE_CONTACT "OGRE-Next Team <webmaster@ogre3d.org>")
 
diff --git a/CMake/PrepareThreadingOptions.cmake b/CMake/PrepareThreadingOptions.cmake
index 3bc93f60c94..5685fff263a 100644
--- a/CMake/PrepareThreadingOptions.cmake
+++ b/CMake/PrepareThreadingOptions.cmake
@@ -56,7 +56,7 @@ endif ()
 # sanitise threading choices
 if (NOT OGRE_CONFIG_THREADS)
 	set(OGRE_CONFIG_THREAD_PROVIDER "none")
-	include_directories(${OGRE_SOURCE_DIR}/OgreMain/include/Threading)
+	include_directories(${PROJECT_SOURCE_DIR}/OgreMain/include/Threading)
 else ()
     if (OGRE_CONFIG_THREAD_PROVIDER STREQUAL "poco")
 		if (NOT POCO_FOUND)
diff --git a/CMake/Templates/SDK_CMakeLists.txt.in b/CMake/Templates/SDK_CMakeLists.txt.in
index 3df8832f728..d746ee7a46f 100644
--- a/CMake/Templates/SDK_CMakeLists.txt.in
+++ b/CMake/Templates/SDK_CMakeLists.txt.in
@@ -36,12 +36,12 @@ project(OGRE-Next)
 
 # Find actual Ogre root
 if (WIN32 OR APPLE)
-  get_filename_component(OGRE_ROOT_DIR "${OGRE_SOURCE_DIR}" ABSOLUTE)
+  get_filename_component(OGRE_ROOT_DIR "${PROJECT_SOURCE_DIR}" ABSOLUTE)
   set(OGRE_TEMPLATES_DIR "${OGRE_ROOT_DIR}/cmake")
   set(OGRE_WORK_DIR "${OGRE_ROOT_DIR}")
   set(CMAKE_MODULE_PATH "${OGRE_ROOT_DIR}/cmake")
 elseif (UNIX)
-  get_filename_component(OGRE_ROOT_DIR "${OGRE_SOURCE_DIR}/../.." ABSOLUTE)
+  get_filename_component(OGRE_ROOT_DIR "${PROJECT_SOURCE_DIR}/../.." ABSOLUTE)
   set(OGRE_TEMPLATES_DIR "${OGRE_ROOT_DIR}/lib/OGRE/cmake")
   set(OGRE_WORK_DIR "${OGRE_ROOT_DIR}")
   set(CMAKE_MODULE_PATH "${OGRE_ROOT_DIR}/lib/OGRE/cmake")
@@ -234,9 +234,9 @@ endif ()
 if (UNIX AND NOT APPLE)
   # on Linux, shipped samples will still be compiled with CMake, so we need
   # the .cfg files in the build directory.
-  configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY)
-  configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY)
-  configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY)
+  configure_file(${PROJECT_SOURCE_DIR}/plugins.cfg ${PROJECT_BINARY_DIR}/bin/plugins.cfg COPYONLY)
+  configure_file(${PROJECT_SOURCE_DIR}/resources.cfg ${PROJECT_BINARY_DIR}/bin/resources.cfg COPYONLY)
+  configure_file(${PROJECT_SOURCE_DIR}/samples.cfg ${PROJECT_BINARY_DIR}/bin/samples.cfg COPYONLY)
 endif ()
 
 if (MINGW)
@@ -247,9 +247,9 @@ if (MINGW)
   else ()
     set(OGRE_BUILD_TYPE "release")
   endif ()
-  set(OGRE_ARCHIVE_OUTPUT ${OGRE_SOURCE_DIR}/lib/${OGRE_BUILD_TYPE})
-  set(OGRE_LIBRARY_OUTPUT ${OGRE_SOURCE_DIR}/lib/${OGRE_BUILD_TYPE})
-  set(OGRE_RUNTIME_OUTPUT ${OGRE_SOURCE_DIR}/bin/${OGRE_BUILD_TYPE})
+  set(OGRE_ARCHIVE_OUTPUT ${PROJECT_SOURCE_DIR}/lib/${OGRE_BUILD_TYPE})
+  set(OGRE_LIBRARY_OUTPUT ${PROJECT_SOURCE_DIR}/lib/${OGRE_BUILD_TYPE})
+  set(OGRE_RUNTIME_OUTPUT ${PROJECT_SOURCE_DIR}/bin/${OGRE_BUILD_TYPE})
 endif ()
 
 
diff --git a/CMake/Templates/html.cfg.in b/CMake/Templates/html.cfg.in
index 7002eb1fc15..79e088158fd 100644
--- a/CMake/Templates/html.cfg.in
+++ b/CMake/Templates/html.cfg.in
@@ -45,14 +45,14 @@ PROJECT_BRIEF          = "Object-Oriented Graphics Rendering Engine"
 # exceed 55 pixels and the maximum width should not exceed 200 pixels.
 # Doxygen will copy the logo to the output directory.
 
-PROJECT_LOGO           = "${OGRE_SOURCE_DIR}/Docs/ogre-logo.png"
+PROJECT_LOGO           = "${PROJECT_SOURCE_DIR}/Docs/ogre-logo.png"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = "${OGRE_BINARY_DIR}/api/"
+OUTPUT_DIRECTORY       = "${PROJECT_BINARY_DIR}/api/"
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -653,7 +653,7 @@ WARN_FORMAT            = "$file:$line: $text"
 # and error messages should be written. If left blank the output is written
 # to stderr.
 
-WARN_LOGFILE           = "${OGRE_BINARY_DIR}/doxygen_warnings.log"
+WARN_LOGFILE           = "${PROJECT_BINARY_DIR}/doxygen_warnings.log"
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
@@ -747,9 +747,9 @@ EXAMPLE_RECURSIVE      = NO
 # directories that contain image that are included in the documentation (see
 # the \image command).
 
-IMAGE_PATH             = "${OGRE_SOURCE_DIR}/Docs/src/manual/" \
-						 "${OGRE_SOURCE_DIR}/Docs/src/images/" \
-						 "${OGRE_SOURCE_DIR}/Docs/src/SettingUpOgre/images/"
+IMAGE_PATH             = "${PROJECT_SOURCE_DIR}/Docs/src/manual/" \
+						 "${PROJECT_SOURCE_DIR}/Docs/src/images/" \
+						 "${PROJECT_SOURCE_DIR}/Docs/src/SettingUpOgre/images/"
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
@@ -941,7 +941,7 @@ HTML_STYLESHEET        =
 # robust against future updates. Doxygen will copy the style sheet file to
 # the output directory.
 
-HTML_EXTRA_STYLESHEET  = "${OGRE_SOURCE_DIR}/Docs/doxygen-awesome.css" "${OGRE_SOURCE_DIR}/Docs/ogre_style.css"
+HTML_EXTRA_STYLESHEET  = "${PROJECT_SOURCE_DIR}/Docs/doxygen-awesome.css" "${PROJECT_SOURCE_DIR}/Docs/ogre_style.css"
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note
diff --git a/CMake/Utils/AndroidMacros.cmake b/CMake/Utils/AndroidMacros.cmake
index 2aeb8e4526e..2bf1411a4a5 100644
--- a/CMake/Utils/AndroidMacros.cmake
+++ b/CMake/Utils/AndroidMacros.cmake
@@ -51,7 +51,7 @@ macro(create_android_proj ANDROID_PROJECT_TARGET)
 	foreach(DEPENDENCY ${DEPENDENCIES})
 	    set(DEPEND_STATIC_LIBS "${DEPENDENCY}Static" ${DEPEND_STATIC_LIBS})
 	endforeach(DEPENDENCY ${DEPENDENCIES})
-	add_static_libs("${OGRE_BINARY_DIR}/lib" ${DEPEND_STATIC_LIBS})
+	add_static_libs("${PROJECT_BINARY_DIR}/lib" ${DEPEND_STATIC_LIBS})
 	if(OGRE_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER)
         add_static_libs("${OGRE_DEPENDENCIES_DIR}/lib/@ANDROID_NDK_ABI_NAME@"  "glsl_optimizer" "glcpp-library" "mesa")
 	endif()
diff --git a/CMake/Utils/MacroLogFeature.cmake b/CMake/Utils/MacroLogFeature.cmake
index c2efe2edb6e..aa82de336e5 100644
--- a/CMake/Utils/MacroLogFeature.cmake
+++ b/CMake/Utils/MacroLogFeature.cmake
@@ -40,17 +40,17 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 IF (NOT _macroLogFeatureAlreadyIncluded)
-   SET(_file ${OGRE_BINARY_DIR}/MissingRequirements.txt)
+   SET(_file ${PROJECT_BINARY_DIR}/MissingRequirements.txt)
    IF (EXISTS ${_file})
       FILE(REMOVE ${_file})
    ENDIF (EXISTS ${_file})
 
-   SET(_file ${OGRE_BINARY_DIR}/EnabledFeatures.txt)
+   SET(_file ${PROJECT_BINARY_DIR}/EnabledFeatures.txt)
    IF (EXISTS ${_file})
       FILE(REMOVE ${_file})
    ENDIF (EXISTS ${_file})
 
-   SET(_file ${OGRE_BINARY_DIR}/DisabledFeatures.txt)
+   SET(_file ${PROJECT_BINARY_DIR}/DisabledFeatures.txt)
    IF (EXISTS ${_file})
       FILE(REMOVE ${_file})
   ENDIF (EXISTS ${_file})
@@ -66,12 +66,12 @@ MACRO(MACRO_LOG_FEATURE _var _package _description _url ) # _required _minvers _
    SET(_comments "${ARGV6}")
 
    IF (${_var})
-     SET(_LOGFILENAME ${OGRE_BINARY_DIR}/EnabledFeatures.txt)
+     SET(_LOGFILENAME ${PROJECT_BINARY_DIR}/EnabledFeatures.txt)
    ELSE (${_var})
      IF (${_required} MATCHES "[Tt][Rr][Uu][Ee]")
-       SET(_LOGFILENAME ${OGRE_BINARY_DIR}/MissingRequirements.txt)
+       SET(_LOGFILENAME ${PROJECT_BINARY_DIR}/MissingRequirements.txt)
      ELSE (${_required} MATCHES "[Tt][Rr][Uu][Ee]")
-       SET(_LOGFILENAME ${OGRE_BINARY_DIR}/DisabledFeatures.txt)
+       SET(_LOGFILENAME ${PROJECT_BINARY_DIR}/DisabledFeatures.txt)
      ENDIF (${_required} MATCHES "[Tt][Rr][Uu][Ee]")
    ENDIF (${_var})
 
@@ -94,7 +94,7 @@ ENDMACRO(MACRO_LOG_FEATURE)
 
 MACRO(MACRO_DISPLAY_FEATURE_LOG)
 
-   SET(_file ${OGRE_BINARY_DIR}/MissingRequirements.txt)
+   SET(_file ${PROJECT_BINARY_DIR}/MissingRequirements.txt)
    IF (EXISTS ${_file})
       FILE(READ ${_file} _requirements)
       MESSAGE(FATAL_ERROR "\n-----------------------------------------------------------------------------\n-- The following REQUIRED packages could NOT be located on your system.\n-- Please install them before continuing this software installation.\n-- If you are in Windows, try passing -DOGRE_DEPENDENCIES_DIR=<path to dependencies>\n-----------------------------------------------------------------------------\n${_requirements}-----------------------------------------------------------------------------")
@@ -105,7 +105,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
    SET(_summary "\n")
 
    SET(_elist 0)
-   SET(_file ${OGRE_BINARY_DIR}/EnabledFeatures.txt)
+   SET(_file ${PROJECT_BINARY_DIR}/EnabledFeatures.txt)
    IF (EXISTS ${_file})
       SET(_elist 1)
       FILE(READ ${_file} _enabled)
@@ -114,7 +114,7 @@ MACRO(MACRO_DISPLAY_FEATURE_LOG)
    ENDIF (EXISTS ${_file})
 
    SET(_dlist 0)
-   SET(_file ${OGRE_BINARY_DIR}/DisabledFeatures.txt)
+   SET(_file ${PROJECT_BINARY_DIR}/DisabledFeatures.txt)
    IF (EXISTS ${_file})
       SET(_dlist 1)
       FILE(READ ${_file} _disabled)
diff --git a/CMake/Utils/OgreAddTargets.cmake b/CMake/Utils/OgreAddTargets.cmake
index 9c13936a2c8..e16b58e82a6 100644
--- a/CMake/Utils/OgreAddTargets.cmake
+++ b/CMake/Utils/OgreAddTargets.cmake
@@ -74,7 +74,7 @@ macro(create_unity_build_files TARGETNAME)
         set(_FILE_CONTENTS "${_FILE_CONTENTS}\#include \"${_FILE}\"\n")
         math(EXPR _FILE_CNT "${_FILE_CNT}+1")
         if(_FILE_CNT EQUAL OGRE_UNITY_FILES_PER_UNIT)
-          set(_FILENAME "${OGRE_BINARY_DIR}/${TARGETNAME}/compile_${TARGETNAME}_${_FILE_NUM}.cpp")
+          set(_FILENAME "${PROJECT_BINARY_DIR}/${TARGETNAME}/compile_${TARGETNAME}_${_FILE_NUM}.cpp")
           check_and_update_file(${_FILENAME} ${_FILE_CONTENTS})
           math(EXPR _FILE_NUM "${_FILE_NUM}+1")
           set(_FILE_CNT 0)
@@ -87,7 +87,7 @@ macro(create_unity_build_files TARGETNAME)
     endforeach()
     # don't forget the last set of files
     if( NOT ${_FILE_CONTENTS}  STREQUAL "" )
-        set(_FILENAME "${OGRE_BINARY_DIR}/${TARGETNAME}/compile_${TARGETNAME}_${_FILE_NUM}.cpp")
+        set(_FILENAME "${PROJECT_BINARY_DIR}/${TARGETNAME}/compile_${TARGETNAME}_${_FILE_NUM}.cpp")
         check_and_update_file(${_FILENAME} ${_FILE_CONTENTS})
         list(APPEND _SOURCES ${_FILENAME})
     endif()
diff --git a/CMake/Utils/OgreConfigTargets.cmake b/CMake/Utils/OgreConfigTargets.cmake
index 930dd365e7d..6195cb25ff6 100644
--- a/CMake/Utils/OgreConfigTargets.cmake
+++ b/CMake/Utils/OgreConfigTargets.cmake
@@ -25,20 +25,20 @@ endif()
 # Default build output paths
 if (NOT OGRE_ARCHIVE_OUTPUT)
   if(APPLE AND NOT OGRE_BUILD_PLATFORM_ANDROID)
-    set(OGRE_ARCHIVE_OUTPUT ${OGRE_BINARY_DIR}/lib/${PLATFORM_NAME})
+    set(OGRE_ARCHIVE_OUTPUT ${PROJECT_BINARY_DIR}/lib/${PLATFORM_NAME})
   else()
-    set(OGRE_ARCHIVE_OUTPUT ${OGRE_BINARY_DIR}/lib)
+    set(OGRE_ARCHIVE_OUTPUT ${PROJECT_BINARY_DIR}/lib)
   endif()
 endif ()
 if (NOT OGRE_LIBRARY_OUTPUT)
   if(APPLE AND NOT OGRE_BUILD_PLATFORM_ANDROID)
-    set(OGRE_LIBRARY_OUTPUT ${OGRE_BINARY_DIR}/lib/${PLATFORM_NAME})
+    set(OGRE_LIBRARY_OUTPUT ${PROJECT_BINARY_DIR}/lib/${PLATFORM_NAME})
   else()
-    set(OGRE_LIBRARY_OUTPUT ${OGRE_BINARY_DIR}/lib)
+    set(OGRE_LIBRARY_OUTPUT ${PROJECT_BINARY_DIR}/lib)
   endif()
 endif ()
 if (NOT OGRE_RUNTIME_OUTPUT)
-  set(OGRE_RUNTIME_OUTPUT ${OGRE_BINARY_DIR}/bin)
+  set(OGRE_RUNTIME_OUTPUT ${PROJECT_BINARY_DIR}/bin)
 endif ()
 
 if (WIN32)
@@ -210,20 +210,20 @@ function(ogre_config_lib LIBNAME EXPORT)
     # install debug pdb files
 	# Static libs don't have PDBs
 	if (NOT OGRE_STATIC)
-#	  install(FILES ${OGRE_BINARY_DIR}/lib${OGRE_LIB_DEBUG_PATH}/${LIBNAME}Static_d.pdb
+#	  install(FILES ${PROJECT_BINARY_DIR}/lib${OGRE_LIB_DEBUG_PATH}/${LIBNAME}Static_d.pdb
 #	    DESTINATION ${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}
 #		CONFIGURATIONS Debug
 #	  )
-#	  install(FILES ${OGRE_BINARY_DIR}/lib${OGRE_LIB_RELWDBG_PATH}/${LIBNAME}Static.pdb
+#	  install(FILES ${PROJECT_BINARY_DIR}/lib${OGRE_LIB_RELWDBG_PATH}/${LIBNAME}Static.pdb
 #	    DESTINATION ${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}
 #		CONFIGURATIONS RelWithDebInfo
 #	  )
 #	else ()
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${LIBNAME}_d.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${LIBNAME}_d.pdb
 	    DESTINATION bin${OGRE_DEBUG_PATH}
 		CONFIGURATIONS Debug
 	  )
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${LIBNAME}.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${LIBNAME}.pdb
 	    DESTINATION bin${OGRE_RELWDBG_PATH}
 		CONFIGURATIONS RelWithDebInfo
 	  )
@@ -245,7 +245,7 @@ function(ogre_config_framework LIBNAME)
          INSTALL_NAME_DIR "@executable_path/../Frameworks"
       )
       set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
-      set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${OGRE_SOURCE_DIR}/OgreMain/include/OgreStableHeaders.h")
+      set_target_properties(${LIBNAME} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${PROJECT_SOURCE_DIR}/OgreMain/include/OgreStableHeaders.h")
       set_target_properties(${LIBNAME} PROPERTIES RESOURCE "${RESOURCE_FILES}")
       set_source_files_properties("${HEADER_FILES}" PROPERTIES MACOSX_PACKAGE_LOCATION Headers)
       set_source_files_properties("${PLATFORM_HEADERS}" PROPERTIES MACOSX_PACKAGE_LOCATION Headers)
@@ -283,20 +283,20 @@ function(ogre_config_plugin PLUGINNAME)
     # install debug pdb files
 	# Static libs don't have PDBs
 	if (NOT OGRE_STATIC)
-#	  install(FILES ${OGRE_BINARY_DIR}/lib${OGRE_LIB_DEBUG_PATH}/${PLUGINNAME}Static_d.pdb
+#	  install(FILES ${PROJECT_BINARY_DIR}/lib${OGRE_LIB_DEBUG_PATH}/${PLUGINNAME}Static_d.pdb
 #	    DESTINATION ${OGRE_LIB_DIRECTORY}${OGRE_LIB_DEBUG_PATH}/opt
 #		CONFIGURATIONS Debug
 #	  )
-#	  install(FILES ${OGRE_BINARY_DIR}/lib${OGRE_LIB_RELWDBG_PATH}/${PLUGINNAME}Static.pdb
+#	  install(FILES ${PROJECT_BINARY_DIR}/lib${OGRE_LIB_RELWDBG_PATH}/${PLUGINNAME}Static.pdb
 #	    DESTINATION ${OGRE_LIB_DIRECTORY}${OGRE_LIB_RELWDBG_PATH}/opt
 #		CONFIGURATIONS RelWithDebInfo
 #	  )
 #	else ()
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${PLUGINNAME}_d.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${PLUGINNAME}_d.pdb
 	    DESTINATION bin${OGRE_DEBUG_PATH}
 		CONFIGURATIONS Debug
 	  )
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${PLUGINNAME}.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${PLUGINNAME}.pdb
 	    DESTINATION bin${OGRE_RELWDBG_PATH}
 		CONFIGURATIONS RelWithDebInfo
 	  )
@@ -352,11 +352,11 @@ function(ogre_config_sample_exe SAMPLENAME)
   ogre_config_sample_common(${SAMPLENAME})
   if (OGRE_INSTALL_PDB AND OGRE_INSTALL_SAMPLES)
 	  # install debug pdb files - no _d on exe
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${SAMPLENAME}.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${SAMPLENAME}.pdb
 		  DESTINATION bin${OGRE_DEBUG_PATH}
 		  CONFIGURATIONS Debug
 		  )
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${SAMPLENAME}.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${SAMPLENAME}.pdb
 		  DESTINATION bin${OGRE_RELWDBG_PATH}
 		  CONFIGURATIONS RelWithDebInfo
 		  )
@@ -377,11 +377,11 @@ function(ogre_config_sample_lib SAMPLENAME)
   ogre_config_sample_common(${SAMPLENAME})
   if (OGRE_INSTALL_PDB AND OGRE_INSTALL_SAMPLES)
 	  # install debug pdb files - with a _d on lib
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${SAMPLENAME}.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${SAMPLENAME}.pdb
 		  DESTINATION bin${OGRE_DEBUG_PATH}
 		  CONFIGURATIONS Debug
 		  )
-	  install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${SAMPLENAME}.pdb
+	  install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${SAMPLENAME}.pdb
 		  DESTINATION bin${OGRE_RELWDBG_PATH}
 		  CONFIGURATIONS RelWithDebInfo
 		  )
@@ -426,11 +426,11 @@ function(ogre_config_tool TOOLNAME)
     ogre_install_target(${TOOLNAME} "" FALSE)
     if (OGRE_INSTALL_PDB)
       # install debug pdb files
-      install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${TOOLNAME}_d.pdb
+      install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_DEBUG_PATH}/${TOOLNAME}_d.pdb
         DESTINATION bin${OGRE_DEBUG_PATH}
         CONFIGURATIONS Debug
         )
-      install(FILES ${OGRE_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${TOOLNAME}.pdb
+      install(FILES ${PROJECT_BINARY_DIR}/bin${OGRE_RELWDBG_PATH}/${TOOLNAME}.pdb
         DESTINATION bin${OGRE_RELWDBG_PATH}
         CONFIGURATIONS RelWithDebInfo
         )
@@ -444,6 +444,6 @@ function(ogre_add_component_include_dir COMPONENTNAME)
 	if (OGRE_SDK_BUILD)
 		include_directories("${OGRE_INCLUDE_DIR}/${COMPONENTNAME}")
 	else()
-		include_directories("${OGRE_SOURCE_DIR}/Components/${COMPONENTNAME}/include")	
+		include_directories("${PROJECT_SOURCE_DIR}/Components/${COMPONENTNAME}/include")	
 	endif()
 endfunction(ogre_add_component_include_dir)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9828a8056d2..3b169d473a0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,15 +56,12 @@ else()
 endif()
 
 project(OGRE-Next)
-# capture ogre location, and at the same time hide legacy cache variables
-set(OGRE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-set(OGRE_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 
 # Include necessary submodules
-set(CMAKE_MODULE_PATH
-  "${OGRE_SOURCE_DIR}/CMake"
-  "${OGRE_SOURCE_DIR}/CMake/Utils"
-  "${OGRE_SOURCE_DIR}/CMake/Packages"
+list(APPEND CMAKE_MODULE_PATH
+  "${PROJECT_SOURCE_DIR}/CMake"
+  "${PROJECT_SOURCE_DIR}/CMake/Utils"
+  "${PROJECT_SOURCE_DIR}/CMake/Packages"
 )
 
 if(ANDROID)
@@ -77,8 +74,8 @@ include(MacroLogFeature)
 include(OgreAddTargets)
 include(OgreConfigTargets)
 include(PreprocessorUtils)
-set(OGRE_TEMPLATES_DIR "${OGRE_SOURCE_DIR}/CMake/Templates")
-set(OGRE_WORK_DIR ${OGRE_BINARY_DIR})
+set(OGRE_TEMPLATES_DIR "${PROJECT_SOURCE_DIR}/CMake/Templates")
+set(OGRE_WORK_DIR ${PROJECT_BINARY_DIR})
 
 
 #####################################################################
@@ -93,10 +90,10 @@ endif ()
 
 # determine Ogre version numbers
 include(OgreGetVersion)
-ogre_get_version(${OGRE_SOURCE_DIR}/OgreMain/include/OgrePrerequisites.h)
+ogre_get_version(${PROJECT_SOURCE_DIR}/OgreMain/include/OgrePrerequisites.h)
 message(STATUS "Configuring OGRE ${OGRE_VERSION}")
 # Configure version file for use by scripts
-configure_file("${OGRE_TEMPLATES_DIR}/version.txt.in" "${OGRE_BINARY_DIR}/version.txt" @ONLY)
+configure_file("${OGRE_TEMPLATES_DIR}/version.txt.in" "${PROJECT_BINARY_DIR}/version.txt" @ONLY)
 
 # determine if we are compiling for a 32bit or 64bit system
 include(CheckTypeSize)
@@ -272,25 +269,25 @@ else()
 endif()
 
 # Add OgreMain include path
-include_directories("${OGRE_SOURCE_DIR}/OgreMain/include")
-include_directories("${OGRE_BINARY_DIR}/include")
+include_directories("${PROJECT_SOURCE_DIR}/OgreMain/include")
+include_directories("${PROJECT_BINARY_DIR}/include")
 if (APPLE)
   if (OGRE_BUILD_PLATFORM_APPLE_IOS)
-    include_directories("${OGRE_SOURCE_DIR}/OgreMain/include/iOS")
+    include_directories("${PROJECT_SOURCE_DIR}/OgreMain/include/iOS")
 
     # Set static early for proper dependency detection
     set(OGRE_STATIC TRUE)
   else ()
-    include_directories("${OGRE_SOURCE_DIR}/OgreMain/include/OSX")
+    include_directories("${PROJECT_SOURCE_DIR}/OgreMain/include/OSX")
   endif ()
 endif (APPLE)
 
 # Add platform-specific render system Metal include path
 if (APPLE AND OGRE_BUILD_RENDERSYSTEM_METAL)
   if (OGRE_BUILD_PLATFORM_APPLE_IOS)
-    include_directories("${OGRE_SOURCE_DIR}/RenderSystems/Metal/include/Windowing/iOS")
+    include_directories("${PROJECT_SOURCE_DIR}/RenderSystems/Metal/include/Windowing/iOS")
   else ()
-    include_directories("${OGRE_SOURCE_DIR}/RenderSystems/Metal/include/Windowing/OSX")
+    include_directories("${PROJECT_SOURCE_DIR}/RenderSystems/Metal/include/Windowing/OSX")
   endif ()
 endif (APPLE AND OGRE_BUILD_RENDERSYSTEM_METAL)
 
@@ -308,14 +305,14 @@ if( OGRE_STATIC AND UNIX AND NOT APPLE AND NOT OGRE_CONFIG_UNIX_NO_X11 )
 endif()
 
 # Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${OGRE_BINARY_DIR}/lib")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${OGRE_BINARY_DIR}/lib")
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${OGRE_BINARY_DIR}/bin")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
 if (WIN32 OR APPLE)
   if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     # We don't want to install in default system location, install is really for the SDK, so call it that
     set(CMAKE_INSTALL_PREFIX
-	  "${OGRE_BINARY_DIR}/sdk" CACHE PATH "OGRE install prefix" FORCE
+	  "${PROJECT_BINARY_DIR}/sdk" CACHE PATH "OGRE install prefix" FORCE
     )
   endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 endif(WIN32 OR APPLE)
@@ -609,8 +606,8 @@ set(OGRE_LIB_DIRECTORY "lib${LIB_SUFFIX}" CACHE STRING "Install path for librari
 if (WIN32)
 	option(OGRE_INSTALL_VSPROPS "Install Visual Studio Property Page." FALSE)
 	if (OGRE_INSTALL_VSPROPS)
-		configure_file(${OGRE_TEMPLATES_DIR}/OGRE.props.in ${OGRE_BINARY_DIR}/OGRE.props)
-		install(FILES ${OGRE_BINARY_DIR}/OGRE.props DESTINATION "${CMAKE_INSTALL_PREFIX}")
+		configure_file(${OGRE_TEMPLATES_DIR}/OGRE.props.in ${PROJECT_BINARY_DIR}/OGRE.props)
+		install(FILES ${PROJECT_BINARY_DIR}/OGRE.props DESTINATION "${CMAKE_INSTALL_PREFIX}")
 	endif ()
 endif ()
 
diff --git a/Components/Atmosphere/CMakeLists.txt b/Components/Atmosphere/CMakeLists.txt
index fbe78ec5a97..695cea1ec3a 100644
--- a/Components/Atmosphere/CMakeLists.txt
+++ b/Components/Atmosphere/CMakeLists.txt
@@ -8,7 +8,6 @@
 #-------------------------------------------------------------------
 
 
-PROJECT(${OGRE_NEXT}Atmosphere)
 
 file(
 	GLOB HEADER_FILES
diff --git a/Components/Hlms/Pbs/CMakeLists.txt b/Components/Hlms/Pbs/CMakeLists.txt
index 0c110d9c9d3..6b257e15ce9 100644
--- a/Components/Hlms/Pbs/CMakeLists.txt
+++ b/Components/Hlms/Pbs/CMakeLists.txt
@@ -9,7 +9,6 @@
 
 # Configure Ogre HLMS Physically Based Shading for OpenGL 3.3+ and D3D11 build
 
-PROJECT(${OGRE_NEXT}HlmsPbs)
 
 file(
 	GLOB HEADER_FILES
diff --git a/Components/Hlms/Unlit/CMakeLists.txt b/Components/Hlms/Unlit/CMakeLists.txt
index 130b572dbaa..3eb8b70ca3e 100644
--- a/Components/Hlms/Unlit/CMakeLists.txt
+++ b/Components/Hlms/Unlit/CMakeLists.txt
@@ -9,7 +9,6 @@
 
 # Configure Ogre HLMS User Interface (2D) for OpenGL 3.3+ and D3D11 build
 
-PROJECT(${OGRE_NEXT}HlmsUnlit)
 
 file(
     GLOB HEADER_FILES
diff --git a/Components/MeshLodGenerator/CMakeLists.txt b/Components/MeshLodGenerator/CMakeLists.txt
index 7be86157f45..590ed451fd1 100644
--- a/Components/MeshLodGenerator/CMakeLists.txt
+++ b/Components/MeshLodGenerator/CMakeLists.txt
@@ -11,7 +11,6 @@
 # MeshLodGenerator optional component
 ############################################################
 
-PROJECT(${OGRE_NEXT}MeshLodGenerator)
 
 # define header and source files for the library
 file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
@@ -22,7 +21,7 @@ add_definitions(-DOGRE_MESHLODGENERATOR_EXPORTS -D_MT -D_USRDLL)
 
 # include headers
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${OGRE_SOURCE_DIR}/OgreMain/include)
+include_directories(${PROJECT_SOURCE_DIR}/OgreMain/include)
 
 # setup target
 ogre_add_library(${OGRE_NEXT}MeshLodGenerator ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
diff --git a/Components/Overlay/CMakeLists.txt b/Components/Overlay/CMakeLists.txt
index 9b74c79fa30..3755a962a4b 100644
--- a/Components/Overlay/CMakeLists.txt
+++ b/Components/Overlay/CMakeLists.txt
@@ -11,7 +11,6 @@
 # Overlay optional component
 ############################################################
 
-PROJECT(${OGRE_NEXT}Overlay)
 
 # define header and source files for the library
 file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
@@ -22,7 +21,7 @@ add_definitions(-DOGRE_OVERLAY_EXPORTS -D_MT -D_USRDLL)
 
 # include headers
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${OGRE_SOURCE_DIR}/OgreMain/include)
+include_directories(${PROJECT_SOURCE_DIR}/OgreMain/include)
 
 ogre_add_component_include_dir(Hlms/Unlit)
 #ogre_add_component_include_dir(Hlms/UnlitMobile)
diff --git a/Components/Paging/CMakeLists.txt b/Components/Paging/CMakeLists.txt
index 32d9c553ef5..42616a1c276 100644
--- a/Components/Paging/CMakeLists.txt
+++ b/Components/Paging/CMakeLists.txt
@@ -11,7 +11,6 @@
 # Paging optional component
 ############################################################
 
-PROJECT(OgrePaging)
 
 # define header and source files for the library
 file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
@@ -22,7 +21,7 @@ add_definitions(-DOGRE_PAGING_EXPORTS -D_MT -D_USRDLL)
 
 # include headers
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${OGRE_SOURCE_DIR}/OgreMain/include)
+include_directories(${PROJECT_SOURCE_DIR}/OgreMain/include)
 
 # setup target
 ogre_add_library(OgrePaging ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
diff --git a/Components/PlanarReflections/CMakeLists.txt b/Components/PlanarReflections/CMakeLists.txt
index 382fa2ef444..9979671df50 100644
--- a/Components/PlanarReflections/CMakeLists.txt
+++ b/Components/PlanarReflections/CMakeLists.txt
@@ -8,7 +8,6 @@
 #-------------------------------------------------------------------
 
 
-PROJECT(${OGRE_NEXT}PlanarReflections)
 
 file(
 	GLOB HEADER_FILES
diff --git a/Components/Property/CMakeLists.txt b/Components/Property/CMakeLists.txt
index f3c6db4edb8..f08a1957c62 100644
--- a/Components/Property/CMakeLists.txt
+++ b/Components/Property/CMakeLists.txt
@@ -11,7 +11,6 @@
 # Paging optional component
 ############################################################
 
-PROJECT(OgreProperty)
 
 # define header and source files for the library
 set (HEADER_FILES
@@ -29,7 +28,7 @@ add_definitions(-DOGRE_PROPERTY_EXPORTS -D_MT -D_USRDLL)
 
 # include headers
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${OGRE_SOURCE_DIR}/OgreMain/include)
+include_directories(${PROJECT_SOURCE_DIR}/OgreMain/include)
 include_directories(${Boost_INCLUDE_DIRS})
 
 # setup target
diff --git a/Components/SceneFormat/CMakeLists.txt b/Components/SceneFormat/CMakeLists.txt
index 49ba326216d..26ca03528c8 100644
--- a/Components/SceneFormat/CMakeLists.txt
+++ b/Components/SceneFormat/CMakeLists.txt
@@ -8,7 +8,6 @@
 #-------------------------------------------------------------------
 
 
-PROJECT(${OGRE_NEXT}SceneFormat)
 
 file(
 	GLOB HEADER_FILES
@@ -21,7 +20,7 @@ file(
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
 
-include_directories(${OGRE_SOURCE_DIR}/Components/Hlms/Common/include)
+include_directories(${PROJECT_SOURCE_DIR}/Components/Hlms/Common/include)
 ogre_add_component_include_dir(Hlms/Pbs)
 
 add_definitions( -DOgreSceneFormat_EXPORTS )
diff --git a/Components/Volume/CMakeLists.txt b/Components/Volume/CMakeLists.txt
index 7ef06eb8283..8e0beae7250 100644
--- a/Components/Volume/CMakeLists.txt
+++ b/Components/Volume/CMakeLists.txt
@@ -11,7 +11,6 @@
 # Volume optional component
 ############################################################
 
-PROJECT(OgreVolume)
 
 # define header and source files for the library
 file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
@@ -22,7 +21,7 @@ add_definitions(-DOGRE_VOLUME_EXPORTS -D_MT -D_USRDLL)
 
 # include headers
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${OGRE_SOURCE_DIR}/OgreMain/include)
+include_directories(${PROJECT_SOURCE_DIR}/OgreMain/include)
 
 # setup target
 ogre_add_library(OgreVolume ${OGRE_COMP_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES} ${PLATFORM_HEADER_FILES} ${PLATFORM_SOURCE_FILES})
diff --git a/Docs/CMakeLists.txt b/Docs/CMakeLists.txt
index e103f30ac53..fbac4104667 100644
--- a/Docs/CMakeLists.txt
+++ b/Docs/CMakeLists.txt
@@ -30,38 +30,38 @@ if(DOXYGEN_FOUND)
     endif ()
     
 	file(GLOB MANUAL
-		${OGRE_SOURCE_DIR}/Docs/src/manual/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/manual/Introduction/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/manual/Migrating/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/manual/Performance/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/manual/Plugins/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/manual/Rendering/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/manual/Scripts/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/SettingUpOgre/*.md
-			${OGRE_SOURCE_DIR}/Docs/src/UsingOgre/*.md
+		${PROJECT_SOURCE_DIR}/Docs/src/manual/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/manual/Introduction/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/manual/Migrating/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/manual/Performance/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/manual/Plugins/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/manual/Rendering/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/manual/Scripts/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/SettingUpOgre/*.md
+			${PROJECT_SOURCE_DIR}/Docs/src/UsingOgre/*.md
 		)
 
-	file(GLOB COMPONENTS ${OGRE_SOURCE_DIR}/Components/*/include ${OGRE_SOURCE_DIR}/Components/Hlms/*/include)
-	file(GLOB PLUGINS ${OGRE_SOURCE_DIR}/PlugIns/*/include)
-	file(GLOB SAMPLES ${OGRE_SOURCE_DIR}/Samples/Media/particle/*.particle)
+	file(GLOB COMPONENTS ${PROJECT_SOURCE_DIR}/Components/*/include ${PROJECT_SOURCE_DIR}/Components/Hlms/*/include)
+	file(GLOB PLUGINS ${PROJECT_SOURCE_DIR}/PlugIns/*/include)
+	file(GLOB SAMPLES ${PROJECT_SOURCE_DIR}/Samples/Media/particle/*.particle)
 
     set(CMAKE_DOXYGEN_INPUT_LIST 
-        \"${OGRE_SOURCE_DIR}/OgreMain/include
+        \"${PROJECT_SOURCE_DIR}/OgreMain/include
         ${COMPONENTS}
         ${PLUGINS}
-        ${OGRE_SOURCE_DIR}/PlugIns
-        ${OGRE_SOURCE_DIR}/RenderSystems
-        ${OGRE_SOURCE_DIR}/Docs/src/apimainpage.md
+        ${PROJECT_SOURCE_DIR}/PlugIns
+        ${PROJECT_SOURCE_DIR}/RenderSystems
+        ${PROJECT_SOURCE_DIR}/Docs/src/apimainpage.md
         ${MANUAL}\")
     string(REPLACE ";" "\" \\\n\"" CMAKE_DOXYGEN_INPUT_LIST "${CMAKE_DOXYGEN_INPUT_LIST}")
-	configure_file(${OGRE_TEMPLATES_DIR}/html.cfg.in ${OGRE_BINARY_DIR}/html.cfg)
+	configure_file(${OGRE_TEMPLATES_DIR}/html.cfg.in ${PROJECT_BINARY_DIR}/html.cfg)
 	add_custom_target(OgreDoc COMMAND 
-        ${DOXYGEN_EXECUTABLE} ${OGRE_BINARY_DIR}/html.cfg
-        DEPENDS ${OGRE_BINARY_DIR}/html.cfg
-        WORKING_DIRECTORY ${OGRE_SOURCE_DIR}/Docs/src/ 
+        ${DOXYGEN_EXECUTABLE} ${PROJECT_BINARY_DIR}/html.cfg
+        DEPENDS ${PROJECT_BINARY_DIR}/html.cfg
+        WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/Docs/src/ 
         COMMENT "Building documentation" VERBATIM)
-	file(MAKE_DIRECTORY ${OGRE_BINARY_DIR}/api/)
+	file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/api/)
 	if (OGRE_INSTALL_DOCS)
-		install(DIRECTORY ${OGRE_BINARY_DIR}/api DESTINATION ${OGRE_DOCS_PATH})
+		install(DIRECTORY ${PROJECT_BINARY_DIR}/api DESTINATION ${OGRE_DOCS_PATH})
 	endif()
 endif()
diff --git a/OgreMain/CMakeLists.txt b/OgreMain/CMakeLists.txt
index f6ad5a07916..3c1fdbdf0f2 100644
--- a/OgreMain/CMakeLists.txt
+++ b/OgreMain/CMakeLists.txt
@@ -11,8 +11,6 @@
 # OgreNextMain core library
 ############################################################
 
-PROJECT(${OGRE_NEXT}Main)
-
 function( add_filtered_h filterName fileString )
 	file(GLOB TMP_FILES ${fileString})
 	set(HEADER_FILES ${HEADER_FILES} ${TMP_FILES} PARENT_SCOPE)
@@ -73,7 +71,7 @@ add_filtered_std("ParticleSystem")
 add_filtered_std("ogrestd")
 add_filtered_std("Vao")
 
-list(APPEND HEADER_FILES ${OGRE_BINARY_DIR}/include/OgreBuildSettings.h
+list(APPEND HEADER_FILES ${PROJECT_BINARY_DIR}/include/OgreBuildSettings.h
 	src/OgreImageResampler.h
 	src/OgrePixelConversions.h
 	src/OgreSIMDHelper.h)
@@ -449,18 +447,18 @@ if (APPLE)
     set(OGRE_OSX_BUILD_CONFIGURATION "$(PLATFORM_NAME)/$(CONFIGURATION)")
   
 	add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD
-		COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
+		COMMAND mkdir ARGS -p ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
         COMMAND ditto 
-		${OGRE_SOURCE_DIR}/OgreMain/include/Threading/*.h ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
-		COMMAND mkdir ARGS -p ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/OSX
+		${PROJECT_SOURCE_DIR}/OgreMain/include/Threading/*.h ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/Threading
+		COMMAND mkdir ARGS -p ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/OSX
         COMMAND ditto 
-		${OGRE_SOURCE_DIR}/OgreMain/include/OSX/*.h ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/OSX
-		COMMAND cd ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers
+		${PROJECT_SOURCE_DIR}/OgreMain/include/OSX/*.h ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/OSX
+		COMMAND cd ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers
 		)
 
     foreach(HEADER_PATH ${THREAD_HEADER_FILES})
         get_filename_component(HEADER_FILE ${HEADER_PATH} NAME)
-        set(FWK_HEADER_PATH ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/${HEADER_FILE})
+        set(FWK_HEADER_PATH ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/${HEADER_FILE})
         add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD
             COMMAND rm -f ${FWK_HEADER_PATH}
             )
@@ -468,7 +466,7 @@ if (APPLE)
 
     foreach(HEADER_PATH ${PLATFORM_HEADERS})
         get_filename_component(HEADER_FILE ${HEADER_PATH} NAME)
-        set(FWK_HEADER_PATH ${OGRE_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/${HEADER_FILE})
+        set(FWK_HEADER_PATH ${PROJECT_BINARY_DIR}/lib/${OGRE_OSX_BUILD_CONFIGURATION}/Ogre.framework/Headers/${HEADER_FILE})
         add_custom_command(TARGET ${OGRE_NEXT}Main POST_BUILD
             COMMAND rm -f ${FWK_HEADER_PATH}
             )
@@ -503,7 +501,7 @@ use_precompiled_header(${OGRE_NEXT}Main
 # install ${OGRE_NEXT}Main
 ogre_config_lib(${OGRE_NEXT}Main TRUE)
 foreach(HEADER_FILE ${HEADER_FILES})
-	string(REGEX REPLACE "((${CMAKE_CURRENT_SOURCE_DIR}|${OGRE_BINARY_DIR})/)?(include|src)/" "" RELATIVE_HEADER_FILE ${HEADER_FILE})
+	string(REGEX REPLACE "((${CMAKE_CURRENT_SOURCE_DIR}|${PROJECT_BINARY_DIR})/)?(include|src)/" "" RELATIVE_HEADER_FILE ${HEADER_FILE})
 	string(REGEX MATCH "((.*)/)+" HEADER_SUBDIRECTORY ${RELATIVE_HEADER_FILE})
 	install(FILES ${HEADER_FILE} DESTINATION include/${OGRE_NEXT_PREFIX}/${HEADER_SUBDIRECTORY})
 endforeach()
diff --git a/RenderSystems/GL3Plus/CMakeLists.txt b/RenderSystems/GL3Plus/CMakeLists.txt
index 67dd1b21032..33f4906c0dd 100644
--- a/RenderSystems/GL3Plus/CMakeLists.txt
+++ b/RenderSystems/GL3Plus/CMakeLists.txt
@@ -33,7 +33,7 @@ if( OGRE_GLSUPPORT_USE_COCOA )
 	file(GLOB PLATFORM_SOURCES "src/windowing/OSX/*.mm")
 	set( PLATFORM_HEADERS_OSX ${PLATFORM_HEADERS} )
 
-	include_directories( include/windowing/OSX "${OGRE_SOURCE_DIR}/OgreMain/include/OSX" )
+	include_directories( include/windowing/OSX "${PROJECT_SOURCE_DIR}/OgreMain/include/OSX" )
 	if( OGRE_GLSUPPORT_NUM_INTERFACES EQUAL 1 )
 		include_directories( src/windowing/OSX )
 	endif()
diff --git a/Samples/2.0/CMakeLists.txt b/Samples/2.0/CMakeLists.txt
index 7402d56f724..4f67d37322e 100644
--- a/Samples/2.0/CMakeLists.txt
+++ b/Samples/2.0/CMakeLists.txt
@@ -14,8 +14,6 @@ if( NOT OGRE_BUILD_PLATFORM_APPLE_IOS AND NOT ANDROID )
 	if( OGRE_BUILD_SAMPLES2 AND NOT SDL2_FOUND )
 		message( STATUS "Could not find dependency for samples: SDL2" )
 		set( OGRE_BUILD_SAMPLES2_SKIP 1 )
-	else()
-		include_directories(${SDL2_INCLUDE_DIR})
 	endif()
 endif()
 
diff --git a/Samples/2.0/Common/CMakeLists.txt b/Samples/2.0/Common/CMakeLists.txt
index ca9c32183f8..caef4059640 100644
--- a/Samples/2.0/Common/CMakeLists.txt
+++ b/Samples/2.0/Common/CMakeLists.txt
@@ -46,21 +46,21 @@ endif()
 
 if( OGRE_STATIC )
 	# Static linking means we need to directly use plugins
-	include_directories( ${OGRE_SOURCE_DIR}/PlugIns/ParticleFX/include )
-	include_directories( ${OGRE_SOURCE_DIR}/PlugIns/ParticleFX2/include )
-	include_directories( ${OGRE_SOURCE_DIR}/RenderSystems/Direct3D11/include )
-	include_directories( ${OGRE_SOURCE_DIR}/RenderSystems/GL3Plus/include )
-	include_directories( ${OGRE_SOURCE_DIR}/RenderSystems/GL3Plus/include/GLSL )
-	include_directories( ${OGRE_SOURCE_DIR}/RenderSystems/GLES2/include )
-	include_directories( ${OGRE_SOURCE_DIR}/RenderSystems/Metal/include )
-	include_directories( ${OGRE_SOURCE_DIR}/RenderSystems/Vulkan/include )
+	include_directories( ${PROJECT_SOURCE_DIR}/PlugIns/ParticleFX/include )
+	include_directories( ${PROJECT_SOURCE_DIR}/PlugIns/ParticleFX2/include )
+	include_directories( ${PROJECT_SOURCE_DIR}/RenderSystems/Direct3D11/include )
+	include_directories( ${PROJECT_SOURCE_DIR}/RenderSystems/GL3Plus/include )
+	include_directories( ${PROJECT_SOURCE_DIR}/RenderSystems/GL3Plus/include/GLSL )
+	include_directories( ${PROJECT_SOURCE_DIR}/RenderSystems/GLES2/include )
+	include_directories( ${PROJECT_SOURCE_DIR}/RenderSystems/Metal/include )
+	include_directories( ${PROJECT_SOURCE_DIR}/RenderSystems/Vulkan/include )
 endif()
 
 add_library(${OGRE_SAMPLES_COMMON_LIBRARY} STATIC ${SOURCE_FILES} ${HEADER_FILES})
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${SDL2_LIBRARY} ${OGRE_NEXT}HlmsPbs ${OGRE_NEXT}HlmsUnlit)
+target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} SDL2::SDL2 ${OGRE_NEXT}HlmsPbs ${OGRE_NEXT}HlmsUnlit)
 if( OGRE_BUILD_COMPONENT_ATMOSPHERE )
 	target_link_libraries(${OGRE_SAMPLES_COMMON_LIBRARY} ${OGRE_NEXT}Atmosphere)
 endif()
diff --git a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
index 5d5c5e57597..45547aa019e 100644
--- a/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
+++ b/Samples/2.0/Tutorials/EmptyProject/CMake/Dependencies/OGRE.cmake
@@ -291,8 +291,7 @@ if( NOT IOS )
 		message( "Could not find SDL2. https://www.libsdl.org/" )
 	else()
 		message( STATUS "Found SDL2" )
-		include_directories( ${SDL2_INCLUDE_DIR} )
-		set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} ${SDL2_LIBRARY} )
+		set( OGRE_DEPENDENCY_LIBS ${OGRE_DEPENDENCY_LIBS} SDL2::SDL2 )
 	endif()
 endif()
 
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index d27a97c52e0..5ff1b99b797 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -61,24 +61,24 @@ if (OGRE_BUILD_TESTS)
 
 
     # Static linking means we need to directly use plugins
-    include_directories(${OGRE_SOURCE_DIR}/PlugIns/BSPSceneManager/include)
-    include_directories(${OGRE_SOURCE_DIR}/PlugIns/CgProgramManager/include)
-    include_directories(${OGRE_SOURCE_DIR}/PlugIns/OctreeSceneManager/include)
-    include_directories(${OGRE_SOURCE_DIR}/PlugIns/OctreeZone/include)
-    include_directories(${OGRE_SOURCE_DIR}/PlugIns/ParticleFX/include)
-    include_directories(${OGRE_SOURCE_DIR}/PlugIns/PCZSceneManager/include)
-    include_directories(${OGRE_SOURCE_DIR}/RenderSystems/Direct3D9/include)
-    include_directories(${OGRE_SOURCE_DIR}/RenderSystems/Direct3D11/include)
-    include_directories(${OGRE_SOURCE_DIR}/RenderSystems/GLES/include)
+    include_directories(${PROJECT_SOURCE_DIR}/PlugIns/BSPSceneManager/include)
+    include_directories(${PROJECT_SOURCE_DIR}/PlugIns/CgProgramManager/include)
+    include_directories(${PROJECT_SOURCE_DIR}/PlugIns/OctreeSceneManager/include)
+    include_directories(${PROJECT_SOURCE_DIR}/PlugIns/OctreeZone/include)
+    include_directories(${PROJECT_SOURCE_DIR}/PlugIns/ParticleFX/include)
+    include_directories(${PROJECT_SOURCE_DIR}/PlugIns/PCZSceneManager/include)
+    include_directories(${PROJECT_SOURCE_DIR}/RenderSystems/Direct3D9/include)
+    include_directories(${PROJECT_SOURCE_DIR}/RenderSystems/Direct3D11/include)
+    include_directories(${PROJECT_SOURCE_DIR}/RenderSystems/GLES/include)
     include_directories(
-      ${OGRE_SOURCE_DIR}/RenderSystems/GLES2/include
-      ${OGRE_SOURCE_DIR}/RenderSystems/GLES2/src/GLSLES/include
+      ${PROJECT_SOURCE_DIR}/RenderSystems/GLES2/include
+      ${PROJECT_SOURCE_DIR}/RenderSystems/GLES2/src/GLSLES/include
       )
     include_directories(
-      ${OGRE_SOURCE_DIR}/RenderSystems/GL/include
-      ${OGRE_SOURCE_DIR}/RenderSystems/GL/src/GLSL/include
-      ${OGRE_SOURCE_DIR}/RenderSystems/GL/src/atifs/include
-      ${OGRE_SOURCE_DIR}/RenderSystems/GL/src/nvparse
+      ${PROJECT_SOURCE_DIR}/RenderSystems/GL/include
+      ${PROJECT_SOURCE_DIR}/RenderSystems/GL/src/GLSL/include
+      ${PROJECT_SOURCE_DIR}/RenderSystems/GL/src/atifs/include
+      ${PROJECT_SOURCE_DIR}/RenderSystems/GL/src/nvparse
       )
     # Link to all enabled plugins
     set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${TEST_DEPENDENCIES})
@@ -86,9 +86,9 @@ if (OGRE_BUILD_TESTS)
     # Need to include resource files so that icons are linked
     if (WIN32)
       set(RESOURCE_FILES
-        ${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/resource.h
-        ${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/OgreWin32Resources.rc
-        ${OGRE_SOURCE_DIR}/OgreMain/src/WIN32/winres.h
+        ${PROJECT_SOURCE_DIR}/OgreMain/src/WIN32/resource.h
+        ${PROJECT_SOURCE_DIR}/OgreMain/src/WIN32/OgreWin32Resources.rc
+        ${PROJECT_SOURCE_DIR}/OgreMain/src/WIN32/winres.h
         )
       source_group(Resources FILES ${RESOURCE_FILES})
     endif ()
@@ -135,7 +135,7 @@ if (OGRE_BUILD_TESTS)
     endif ()
     if (OGRE_BUILD_COMPONENT_PROPERTY)
       include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Components/Property/include
-        ${OGRE_SOURCE_DIR}/Components/Property/include)
+        ${PROJECT_SOURCE_DIR}/Components/Property/include)
 
       set(OGRE_LIBRARIES ${OGRE_LIBRARIES} OgreProperty)
       list(APPEND HEADER_FILES Components/Property/include/PropertyTests.h)
@@ -143,7 +143,7 @@ if (OGRE_BUILD_TESTS)
     endif ()
     if (OGRE_BUILD_COMPONENT_OVERLAY)
 	  include_directories(${CMAKE_CURRENT_SOURCE_DIR}/Components/Overlay/include
-	    ${OGRE_SOURCE_DIR}/Components/Overlay/include)
+	    ${PROJECT_SOURCE_DIR}/Components/Overlay/include)
 	  
 	  set(OGRE_LIBRARIES ${OGRE_LIBRARIES} ${OGRE_NEXT}Overlay)
 	endif ()
@@ -152,34 +152,34 @@ if (OGRE_BUILD_TESTS)
 	target_link_libraries(Test_Ogre ${OGRE_LIBRARIES} ${CppUnit_LIBRARIES})
 	if(APPLE AND NOT OGRE_BUILD_PLATFORM_APPLE_IOS)
         set(OGRE_BUILT_FRAMEWORK "$(PLATFORM_NAME)/$(CONFIGURATION)")
-        set(OGRE_TEST_CONTENTS_PATH ${OGRE_BINARY_DIR}/bin/$(CONFIGURATION)/Test_Ogre.app/Contents)
+        set(OGRE_TEST_CONTENTS_PATH ${PROJECT_BINARY_DIR}/bin/$(CONFIGURATION)/Test_Ogre.app/Contents)
 		set_target_properties(Test_Ogre PROPERTIES
 			LINK_FLAGS "-framework Carbon -framework Cocoa")
         add_custom_command(TARGET Test_Ogre POST_BUILD
             COMMAND mkdir ARGS -p ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/CustomCapabilities
             COMMAND ditto 
-            ${OGRE_SOURCE_DIR}/Tests/Media/CustomCapabilities/* ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/CustomCapabilities
+            ${PROJECT_SOURCE_DIR}/Tests/Media/CustomCapabilities/* ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/CustomCapabilities
             )
             
         add_custom_command(TARGET Test_Ogre POST_BUILD
             COMMAND mkdir ARGS -p ${OGRE_TEST_CONTENTS_PATH}/Resources
-            COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/plugins.cfg 
+            COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/bin/plugins.cfg 
             ${OGRE_TEST_CONTENTS_PATH}/Resources/
-            COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg 
+            COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/bin/resources.cfg 
             ${OGRE_TEST_CONTENTS_PATH}/Resources/
-            COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg 
+            COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/bin/samples.cfg 
             ${OGRE_TEST_CONTENTS_PATH}/Resources/
             COMMAND ditto 
-            ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/
+            ${PROJECT_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/
             COMMAND ditto 
-            ${OGRE_SOURCE_DIR}/Tests/OgreMain/misc/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/misc/
+            ${PROJECT_SOURCE_DIR}/Tests/OgreMain/misc/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/misc/
             COMMAND ditto 
-            ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_TEST_CONTENTS_PATH}/Resources
+            ${PROJECT_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_TEST_CONTENTS_PATH}/Resources
 		)
 
         add_custom_command(TARGET Test_Ogre POST_BUILD
             COMMAND mkdir ARGS -p ${OGRE_TEST_CONTENTS_PATH}/Frameworks
-            COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/Ogre.framework
+            COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/Ogre.framework
             ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
             COMMAND ln ARGS -s -f ${Cg_LIBRARY_REL}
             ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
@@ -188,19 +188,19 @@ if (OGRE_BUILD_TESTS)
             COMMAND mkdir ARGS -p ${OGRE_TEST_CONTENTS_PATH}/Plugins)
         if (OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
             add_custom_command(TARGET Test_Ogre POST_BUILD
-                COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/RenderSystem_GL3Plus.framework
+                COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/RenderSystem_GL3Plus.framework
                 ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
                 )
         endif ()
         if (OGRE_BUILD_PLUGIN_CG)
             add_custom_command(TARGET Test_Ogre POST_BUILD
-                COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/Plugin_CgProgramManager.framework
+                COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/Plugin_CgProgramManager.framework
                 ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
                 )
         endif()
         if (OGRE_BUILD_PLUGIN_PFX)
             add_custom_command(TARGET Test_Ogre POST_BUILD
-                COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/Plugin_ParticleFX.framework
+                COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/Plugin_ParticleFX.framework
                 ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
                 )
         endif()
@@ -208,43 +208,43 @@ if (OGRE_BUILD_TESTS)
       # Components
       if (OGRE_BUILD_COMPONENT_MESHLODGENERATOR)
         add_custom_command(TARGET Test_Ogre POST_BUILD
-          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreMeshLodGenerator.framework
+          COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreMeshLodGenerator.framework
           ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
           )
       endif()
       if (OGRE_BUILD_COMPONENT_PAGING)
         add_custom_command(TARGET Test_Ogre POST_BUILD
-          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgrePaging.framework
+          COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgrePaging.framework
           ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
           )
       endif()
       if (OGRE_BUILD_COMPONENT_PROPERTY)
         add_custom_command(TARGET Test_Ogre POST_BUILD
-          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreProperty.framework
+          COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreProperty.framework
           ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
           )
       endif()
       if (OGRE_BUILD_COMPONENT_RTSHADERSYSTEM)
         add_custom_command(TARGET Test_Ogre POST_BUILD
-          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreRTShaderSystem.framework
+          COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreRTShaderSystem.framework
           ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
           )
       endif()
       if (OGRE_BUILD_COMPONENT_TERRAIN)
         add_custom_command(TARGET Test_Ogre POST_BUILD
-          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreTerrain.framework
+          COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreTerrain.framework
           ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
           )
       endif()
       if (OGRE_BUILD_COMPONENT_VOLUME)
         add_custom_command(TARGET Test_Ogre POST_BUILD
-          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreVolume.framework
+          COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreVolume.framework
           ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
           )
       endif()
       if (OGRE_BUILD_COMPONENT_OVERLAY)
         add_custom_command(TARGET Test_Ogre POST_BUILD
-          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreOverlay.framework
+          COMMAND ln ARGS -s -f ${PROJECT_BINARY_DIR}/lib/${OGRE_BUILT_FRAMEWORK}/OgreOverlay.framework
           ${OGRE_TEST_CONTENTS_PATH}/Frameworks/
           )
       endif()
@@ -253,10 +253,10 @@ if (OGRE_BUILD_TESTS)
 		# Copy necessary unit test data
 				
 		if (OGRE_CONFIG_ENABLE_ZIP)
-			file(COPY ${OGRE_SOURCE_DIR}/Tests/OgreMain/misc DESTINATION ${OGRE_BINARY_DIR}/Tests/OgreMain/)
+			file(COPY ${PROJECT_SOURCE_DIR}/Tests/OgreMain/misc DESTINATION ${PROJECT_BINARY_DIR}/Tests/OgreMain/)
 		endif ()
 		
-		file(COPY ${OGRE_SOURCE_DIR}/Tests/Media/CustomCapabilities DESTINATION ${OGRE_BINARY_DIR}/Tests/Media)
+		file(COPY ${PROJECT_SOURCE_DIR}/Tests/Media/CustomCapabilities DESTINATION ${PROJECT_BINARY_DIR}/Tests/Media)
 	  
     endif()
   else (CppUnit_FOUND)
diff --git a/Tests/PlayPen/CMakeLists.txt b/Tests/PlayPen/CMakeLists.txt
index 8b0b144eb77..1dabc33a21a 100644
--- a/Tests/PlayPen/CMakeLists.txt
+++ b/Tests/PlayPen/CMakeLists.txt
@@ -18,7 +18,7 @@ set(SOURCE_FILES
 
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-include_directories(${OGRE_SOURCE_DIR}/Samples/Common/include)
+include_directories(${PROJECT_SOURCE_DIR}/Samples/Common/include)
 ogre_add_component_include_dir(Terrain)
 ogre_add_component_include_dir(Overlay)
 ogre_add_component_include_dir(MeshLodGenerator)
diff --git a/Tools/MeshTool/CMakeLists.txt b/Tools/MeshTool/CMakeLists.txt
index a3b1188b603..1869d866ce8 100644
--- a/Tools/MeshTool/CMakeLists.txt
+++ b/Tools/MeshTool/CMakeLists.txt
@@ -20,7 +20,7 @@ ogre_add_executable(OgreMeshTool ${SOURCE_FILES})
 ogre_add_component_include_dir(MeshLodGenerator)
 
 if(OGRE_STATIC)
-	include_directories("${OGRE_SOURCE_DIR}/RenderSystems/NULL/include")
+	include_directories("${PROJECT_SOURCE_DIR}/RenderSystems/NULL/include")
 endif ()
 
 target_link_libraries(OgreMeshTool ${OGRE_LIBRARIES} ${OGRE_MeshLodGenerator_LIBRARIES})