Browse Source

Fixed find_library() command in FindUrho3D.cmake module to correctly separate list variables with their respective argument separator.

Wei Tjong Yao 12 years ago
parent
commit
3d48e05714
1 changed files with 9 additions and 12 deletions
  1. 9 12
      Source/CMake/Modules/FindUrho3D.cmake

+ 9 - 12
Source/CMake/Modules/FindUrho3D.cmake

@@ -31,6 +31,11 @@
 
 set (URHO3D_FOUND 0)
 
+set (URHO3D_LIB_NAMES Urho3D)
+if (WIN32)
+    set (URHO3D_LIB_NAMES ${URHO3D_LIB_NAMES} Urho3D_d)
+endif ()
+
 set (URHO3D_HOME $ENV{URHO3D_HOME})
 if (URHO3D_HOME)
     file (TO_CMAKE_PATH ${URHO3D_HOME} URHO3D_HOME)
@@ -66,22 +71,14 @@ if (URHO3D_HOME)
             set (URHO3D_INCLUDE_DIR ${URHO3D_INCLUDE_DIR} ${URHO3D_HOME}/Build/Engine)
             set (URHO3D_LIB_SEARCH_PATH ${URHO3D_HOME}/Lib)
         endif ()
-        if (WIN32)
-            find_library (URHO3D_LIBRARIES NAMES Urho3D Urho3D_d ${URHO3D_LIB_SEARCH_PATH} NO_DEFAULT_PATH)
-        else ()
-            find_library (URHO3D_LIBRARIES Urho3D ${URHO3D_LIB_SEARCH_PATH} NO_DEFAULT_PATH)
-        endif ()
+        find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} PATHS ${URHO3D_LIB_SEARCH_PATH} NO_DEFAULT_PATH)
     endif ()
 else ()
     set (URHO3D_INC_SEARCH_PATH /opt/include)
-    find_path (URHO3D_INCLUDE_DIR Engine.h PATH_SUFFIXES Urho3D ${URHO3D_INC_SEARCH_PATH})
+    find_path (URHO3D_INCLUDE_DIR Urho3D.h ${URHO3D_INC_SEARCH_PATH} PATH_SUFFIXES Urho3D)
     
     set (URHO3D_LIB_SEARCH_PATH /opt/lib)
-    if (WIN32)
-        find_library (URHO3D_LIBRARIES NAMES Urho3D Urho3D_d PATH_SUFFIXES Urho3D ${URHO3D_LIB_SEARCH_PATH})
-    else ()
-        find_library (URHO3D_LIBRARIES Urho3D PATH_SUFFIXES Urho3D ${URHO3D_LIB_SEARCH_PATH})
-    endif ()
+    find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} PATHS ${URHO3D_LIB_SEARCH_PATH} PATH_SUFFIXES Urho3D)
 endif ()
 
 if (URHO3D_INCLUDE_DIR AND URHO3D_LIBRARIES)
@@ -94,7 +91,7 @@ if (URHO3D_FOUND)
     FIND_PACKAGE_MESSAGE (Urho3D "Found Urho3D: ${URHO3D_LIBRARIES} ${URHO3D_INCLUDE_DIR}" "[${URHO3D_LIBRARIES}][${URHO3D_INCLUDE_DIR}]")
 else ()
     if (Urho3D_FIND_REQUIRED)
-        message (FATAL_ERROR "Could not find Urho3D installation or build tree via ENV{URHO3D_HOME}")
+        message (FATAL_ERROR "Could not find Urho3D library installation or project root tree via ENV{URHO3D_HOME}")
     endif ()
 endif ()