Project restructuring [PART.2]

modules/worldengine/nucleus/cmake/macros/CheckPlatform.cmake

@@ -1,18 +0,0 @@
-# check what platform we're on (64-bit or 32-bit), and create a simpler test than CMAKE_SIZEOF_VOID_P
-if(CMAKE_SIZEOF_VOID_P MATCHES 8)
-    set(PLATFORM 64)
-    MESSAGE(STATUS "Detected 64-bit platform")
-else()
-    set(PLATFORM 32)
-    MESSAGE(STATUS "Detected 32-bit platform")
-endif()
-
-include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/settings.cmake")
-
-if(WIN32)
-  include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/win/settings.cmake")
-elseif(UNIX)
-  include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/unix/settings.cmake")
-endif()
-
-include("${CMAKE_SOURCE_DIR}/modules/acore/cmake/platform/after_platform.cmake")

modules/worldengine/nucleus/src/CMakeLists.txt

@@ -56,10 +56,10 @@ set(shared_STAT_SRCS
 
 include_directories(
   ${CMAKE_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/recastnavigation/Detour
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/SFMT
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/sockets/include
-  ${CMAKE_SOURCE_DIR}/modules/acore/deps/utf8cpp
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/recastnavigation/Detour
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/SFMT
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/sockets/include
+  ${CMAKE_SOURCE_DIR}/modules/worldengine/deps/utf8cpp
   ${CMAKE_SOURCE_DIR}/src
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/Configuration

modules/worldengine/nucleus/src/cmake/compiler/gcc/settings.cmake

@@ -4,7 +4,7 @@ add_definitions(-D_BUILD_DIRECTIVE='"${CMAKE_BUILD_TYPE}"')
 set(GCC_EXPECTED_VERSION 4.8.2)
 
 if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS GCC_EXPECTED_VERSION)
-  message(FATAL_ERROR "GCC: AzerothCore requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}")
+  message(FATAL_ERROR "GCC: This project requires version ${GCC_EXPECTED_VERSION} to build but found ${CMAKE_CXX_COMPILER_VERSION}")
 endif()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

modules/worldengine/nucleus/src/cmake/macros/CheckPlatform.cmake

@@ -0,0 +1,18 @@
+# check what platform we're on (64-bit or 32-bit), and create a simpler test than CMAKE_SIZEOF_VOID_P
+if(CMAKE_SIZEOF_VOID_P MATCHES 8)
+    set(PLATFORM 64)
+    MESSAGE(STATUS "Detected 64-bit platform")
+else()
+    set(PLATFORM 32)
+    MESSAGE(STATUS "Detected 32-bit platform")
+endif()
+
+include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/settings.cmake")
+
+if(WIN32)
+  include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/win/settings.cmake")
+elseif(UNIX)
+  include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/unix/settings.cmake")
+endif()
+
+include("${CMAKE_SOURCE_DIR}/modules/worldengine/nucleus/src/cmake/platform/after_platform.cmake")