Moved the Urho3D library code to Engine directory.

CMakeLists.txt

@@ -50,7 +50,7 @@ if (NOT IOS AND NOT ANDROID AND NOT RASPI AND USE_OPENGL)
 endif ()
 
 # Add global include directories for export header and SDL header
-include_directories (${CMAKE_BINARY_DIR} ThirdParty/SDL/include)
+include_directories (${CMAKE_BINARY_DIR}/Engine ThirdParty/SDL/include)
 
 # Add targets
 add_subdirectory (Engine/Audio)
@@ -103,7 +103,7 @@ endif ()
 # Urho3D build type is mutually exclusive due to potential different visibility (export) attribute
 if (URHO3D_BUILD_TYPE MATCHES "STATIC|SHARED" AND NOT IOS AND NOT ANDROID)
     # Urho3D library
-    add_subdirectory (Urho3D/lib)
+    add_subdirectory (Engine)
 else ()
     # Urho3D script host application
     add_subdirectory (Tools/Urho3D)
@@ -151,9 +151,9 @@ endif ()
 
 # Generate platform specific export header file automatically
 set_target_properties (Urho3D PROPERTIES DEFINE_SYMBOL URHO3D_EXPORTS)
-generate_export_header (Urho3D EXPORT_MACRO_NAME URHO3D_API EXPORT_FILE_NAME Urho3D.h)
+generate_export_header (Urho3D EXPORT_MACRO_NAME URHO3D_API EXPORT_FILE_NAME Engine/Urho3D.h)
 
 # Append Urho3D license notice to the export header file
-file (READ ${CMAKE_SOURCE_DIR}/Urho3D.h.in LICENSE)
-file (READ ${CMAKE_BINARY_DIR}/Urho3D.h EXPORT_DEFINE)
-file (WRITE ${CMAKE_BINARY_DIR}/Urho3D.h ${LICENSE}${EXPORT_DEFINE})
+file (READ ${CMAKE_SOURCE_DIR}/Engine/Urho3D.h.in LICENSE)
+file (READ ${CMAKE_BINARY_DIR}/Engine/Urho3D.h EXPORT_DEFINE)
+file (WRITE ${CMAKE_BINARY_DIR}/Engine/Urho3D.h ${LICENSE}${EXPORT_DEFINE})

cmake/Modules/FindUrho3D.cmake

@@ -36,37 +36,38 @@ if (URHO3D_HOME)
     file (TO_CMAKE_PATH ${URHO3D_HOME} URHO3D_HOME)
     
     # Construct build tree paths from URHO3D_HOME environment variable
-    find_file (BUILD_TREE_PATH Urho3D.h.in ${URHO3D_HOME} NO_DEFAULT_PATH)
-    if (NOT BUILD_TREE_PATH)
-        find_file (BUILD_TREE_PATH Urho3D.h.in ${URHO3D_HOME}/trunk NO_DEFAULT_PATH)
-    endif ()
+    find_file (BUILD_TREE_PATH Urho3D.h.in ${URHO3D_HOME}/Source/Engine NO_DEFAULT_PATH)
+      #todo: Remove this after source tree move is completed
+      if (NOT BUILD_TREE_PATH)
+          find_file (BUILD_TREE_PATH Urho3D.h.in ${URHO3D_HOME}/Engine NO_DEFAULT_PATH)
+      endif ()
     if (BUILD_TREE_PATH)
         string (REPLACE "/Urho3D.h.in" "" BUILD_TREE_PATH ${BUILD_TREE_PATH})
         set (URHO3D_INCLUDE_DIR
-            ${BUILD_TREE_PATH}/Engine/Audio
-            ${BUILD_TREE_PATH}/Engine/Container
-            ${BUILD_TREE_PATH}/Engine/Core
-            ${BUILD_TREE_PATH}/Engine/Engine
-            ${BUILD_TREE_PATH}/Engine/Graphics
-            ${BUILD_TREE_PATH}/Engine/Input
-            ${BUILD_TREE_PATH}/Engine/IO
-            ${BUILD_TREE_PATH}/Engine/Math
-            ${BUILD_TREE_PATH}/Engine/Navigation
-            ${BUILD_TREE_PATH}/Engine/Network
-            ${BUILD_TREE_PATH}/Engine/Physics
-            ${BUILD_TREE_PATH}/Engine/Resource
-            ${BUILD_TREE_PATH}/Engine/Scene
-            ${BUILD_TREE_PATH}/Engine/Script
-            ${BUILD_TREE_PATH}/Engine/UI
-            ${BUILD_TREE_PATH}/Extras/LuaScript
-            ${BUILD_TREE_PATH}/Urho3D/lib)
+            ${BUILD_TREE_PATH}
+            ${BUILD_TREE_PATH}/Audio
+            ${BUILD_TREE_PATH}/Container
+            ${BUILD_TREE_PATH}/Core
+            ${BUILD_TREE_PATH}/Engine
+            ${BUILD_TREE_PATH}/Graphics
+            ${BUILD_TREE_PATH}/Input
+            ${BUILD_TREE_PATH}/IO
+            ${BUILD_TREE_PATH}/Math
+            ${BUILD_TREE_PATH}/Navigation
+            ${BUILD_TREE_PATH}/Network
+            ${BUILD_TREE_PATH}/Physics
+            ${BUILD_TREE_PATH}/Resource
+            ${BUILD_TREE_PATH}/Scene
+            ${BUILD_TREE_PATH}/Script
+            ${BUILD_TREE_PATH}/UI
+            ${BUILD_TREE_PATH}/../Extras/LuaScript)
 
-        if (RASPI)            
-            set (URHO3D_INCLUDE_DIR ${URHO3D_INCLUDE_DIR} ${BUILD_TREE_PATH}/../raspi-build)
-            set (URHO3D_LIB_SEARCH_PATH ${BUILD_TREE_PATH}/../raspi-build/Urho3D/lib)
+        if (RASPI)
+            set (URHO3D_INCLUDE_DIR ${URHO3D_INCLUDE_DIR} ${BUILD_TREE_PATH}/../../raspi-build/Engine)
+            set (URHO3D_LIB_SEARCH_PATH ${BUILD_TREE_PATH}/../../raspi-build/Engine)
         else ()
-            set (URHO3D_INCLUDE_DIR ${URHO3D_INCLUDE_DIR} ${BUILD_TREE_PATH}/../build)
-            set (URHO3D_LIB_SEARCH_PATH ${BUILD_TREE_PATH}/../build/Urho3D/lib)
+            set (URHO3D_INCLUDE_DIR ${URHO3D_INCLUDE_DIR} ${BUILD_TREE_PATH}/../../build/Engine)
+            set (URHO3D_LIB_SEARCH_PATH ${BUILD_TREE_PATH}/../../build/Engine)
         endif ()
         find_library (URHO3D_LIBRARIES Urho3D ${URHO3D_LIB_SEARCH_PATH} NO_DEFAULT_PATH)
     endif ()