Browse Source

Fix wrong include search path for Bullet and Lua. Fix #640.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
b82fe08521
1 changed files with 3 additions and 2 deletions
  1. 3 2
      CMake/Modules/FindUrho3D.cmake

+ 3 - 2
CMake/Modules/FindUrho3D.cmake

@@ -111,13 +111,14 @@ else ()
         endif ()
     endif ()
     if (URHO3D_INCLUDE_DIRS)
+        set (BASE_INCLUDE_DIR ${URHO3D_INCLUDE_DIRS})   # Preserve the base include dir because the original variable will be turned into a list below
         get_filename_component (PATH ${URHO3D_INCLUDE_DIRS} PATH)
         set (URHO3D_INCLUDE_DIRS ${PATH} ${URHO3D_INCLUDE_DIRS}/ThirdParty)
         if (URHO3D_PHYSICS)
-            list (APPEND URHO3D_INCLUDE_DIRS ${URHO3D_INCLUDE_DIRS}/ThirdParty/Bullet)
+            list (APPEND URHO3D_INCLUDE_DIRS ${BASE_INCLUDE_DIR}/ThirdParty/Bullet)
         endif ()
         if (URHO3D_LUA)
-            list (APPEND URHO3D_INCLUDE_DIRS ${URHO3D_INCLUDE_DIRS}/ThirdParty/Lua${JIT})
+            list (APPEND URHO3D_INCLUDE_DIRS ${BASE_INCLUDE_DIR}/ThirdParty/Lua${JIT})
         endif ()
         if (NOT URHO3D_HOME)
             # URHO3D_HOME is not set when using SDK installed on system-wide default location, so set it now