Rename var name from <package>_INCLUDE_DIR to <package>_INCLUDE_DIRS.

See http://urho3d.prophpbb.com/topic9.html.

Docs/GettingStarted.dox

@@ -314,7 +314,7 @@ include (Urho3D-CMake-magic)
 
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
-include_directories (${URHO3D_INCLUDE_DIR})
+include_directories (${URHO3D_INCLUDE_DIRS})
 
 # Define target name
 set (TARGET_NAME Main)

Rakefile

@@ -67,7 +67,7 @@ include (Urho3D-CMake-magic)
 
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
-include_directories (\\${URHO3D_INCLUDE_DIR})
+include_directories (\\${URHO3D_INCLUDE_DIRS})
 
 # Define target name
 set (TARGET_NAME Main)

Source/CMake/Modules/FindBCM_VC.cmake

@@ -23,7 +23,7 @@
 # Find Broadcom VideoCore firmware installation
 #
 #  BCM_VC_FOUND
-#  BCM_VC_INCLUDE_DIR
+#  BCM_VC_INCLUDE_DIRS
 #  BCM_VC_LIBRARIES
 #
 
@@ -39,26 +39,26 @@ set (BCM_VC_INC_SEARCH_PATH /opt/vc/include)
 set (BCM_VC_LIB_SEARCH_PATH /opt/vc/lib)
 
 # Assume all the other headers are installed at same relative path as bcm_host.h
-find_path (BCM_VC_INCLUDE_DIR bcm_host.h PATHS ${BCM_VC_INC_SEARCH_PATH} PATH_SUFFIXES vc)
+find_path (BCM_VC_INCLUDE_DIRS bcm_host.h PATHS ${BCM_VC_INC_SEARCH_PATH} PATH_SUFFIXES vc)
 
 # Assume all the other libs are installed at the same relative path as libbcm_host.so
 find_library (BCM_VC_LIB_BCM_HOST bcm_host PATHS ${BCM_VC_LIB_SEARCH_PATH} PATH_SUFFIXES vc)
 find_library (BCM_VC_LIB_EGL EGL PATHS ${BCM_VC_LIB_SEARCH_PATH} PATH_SUFFIXES vc)
 find_library (BCM_VC_LIB_GLES2 GLESv2 PATHS ${BCM_VC_LIB_SEARCH_PATH} PATH_SUFFIXES vc)
 
-if (BCM_VC_INCLUDE_DIR AND BCM_VC_LIB_BCM_HOST AND BCM_VC_LIB_EGL AND BCM_VC_LIB_GLES2)
-    list (APPEND BCM_VC_INCLUDE_DIR ${BCM_VC_INCLUDE_DIR}/interface/vcos/pthreads)  # Note: variable change to list context after this
+if (BCM_VC_INCLUDE_DIRS AND BCM_VC_LIB_BCM_HOST AND BCM_VC_LIB_EGL AND BCM_VC_LIB_GLES2)
+    list (APPEND BCM_VC_INCLUDE_DIRS ${BCM_VC_INCLUDE_DIRS}/interface/vcos/pthreads)  # Note: variable change to list context after this
     set (BCM_VC_LIBRARIES ${BCM_VC_LIB_BCM_HOST} ${BCM_VC_LIB_EGL} ${BCM_VC_LIB_GLES2})
     set (BCM_VC_FOUND 1)
 endif ()
 
 if (BCM_VC_FOUND)
     include (FindPackageMessage)
-    FIND_PACKAGE_MESSAGE (BCM_VC "Found Broadcom VideoCore firmware: ${BCM_VC_LIBRARIES} ${BCM_VC_INCLUDE_DIR}" "[${BCM_VC_LIBRARIES}][${BCM_VC_INCLUDE_DIR}]")
+    FIND_PACKAGE_MESSAGE (BCM_VC "Found Broadcom VideoCore firmware: ${BCM_VC_LIBRARIES} ${BCM_VC_INCLUDE_DIRS}" "[${BCM_VC_LIBRARIES}][${BCM_VC_INCLUDE_DIRS}]")
 else ()
     if (BCM_VC_FIND_REQUIRED)
         message (FATAL_ERROR "Could not find Broadcom VideoCore firmware")
     endif ()
 endif ()
 
-mark_as_advanced (BCM_VC_INCLUDE_DIR BCM_VC_LIBRARIES)
+mark_as_advanced (BCM_VC_INCLUDE_DIRS BCM_VC_LIBRARIES)

Source/CMake/Modules/FindDirect3D.cmake

@@ -24,9 +24,9 @@
 # The search paths are based on realXtend Tundra CMake build system (https://github.com/realXtend/naali)
 #
 #  DIRECT3D_FOUND
-#  DIRECT3D_INCLUDE_DIR
-#  DIRECT3D_LIBRARY
-#  DIRECT3D_COMPILER_LIBRARY
+#  DIRECT3D_INCLUDE_DIRS
+#  DIRECT3D_LIBRARIES
+#  DIRECT3D_COMPILER_LIBRARIES
 #
 
 if (NOT WIN32)
@@ -41,7 +41,7 @@ set (DIRECTX_INC_SEARCH_PATH
     "$ENV{DXSDK_DIR}/Include"
     "C:/Program Files (x86)/Microsoft DirectX SDK*/Include"
     "C:/Program Files/Microsoft DirectX SDK*/Include")
-find_path (DIRECT3D_INCLUDE_DIR d3dx9.h ${DIRECTX_INC_SEARCH_PATH})
+find_path (DIRECT3D_INCLUDE_DIRS d3dx9.h ${DIRECTX_INC_SEARCH_PATH})
 
 if (CMAKE_CL_64)
     set (DIRECTX_LIB_SEARCH_PATH
@@ -60,21 +60,21 @@ else ()
         "C:/Program Files/Microsoft DirectX SDK*/Lib"
         "C:/Program Files/Microsoft DirectX SDK*/Lib/x86")
 endif ()
-find_library (DIRECT3D_LIBRARY d3d9 ${DIRECTX_LIB_SEARCH_PATH})
-find_library (DIRECT3D_COMPILER_LIBRARY d3dcompiler ${DIRECTX_LIB_SEARCH_PATH})
+find_library (DIRECT3D_LIBRARIES d3d9 ${DIRECTX_LIB_SEARCH_PATH})
+find_library (DIRECT3D_COMPILER_LIBRARIES d3dcompiler ${DIRECTX_LIB_SEARCH_PATH})
 
-if (DIRECT3D_INCLUDE_DIR AND DIRECT3D_LIBRARY AND DIRECT3D_COMPILER_LIBRARY)
+if (DIRECT3D_INCLUDE_DIRS AND DIRECT3D_LIBRARIES AND DIRECT3D_COMPILER_LIBRARIES)
     set (DIRECT3D_FOUND 1)
 endif ()
 
 if (DIRECT3D_FOUND)
     include (FindPackageMessage)
-    FIND_PACKAGE_MESSAGE (Direct3D "Found DirectX SDK: ${DIRECT3D_LIBRARY} ${DIRECT3D_INCLUDE_DIR}" "[${DIRECT3D_LIBRARY}][${DIRECT3D_INCLUDE_DIR}]")
+    FIND_PACKAGE_MESSAGE (Direct3D "Found DirectX SDK: ${DIRECT3D_LIBRARIES} ${DIRECT3D_INCLUDE_DIRS}" "[${DIRECT3D_LIBRARIES}][${DIRECT3D_INCLUDE_DIRS}]")
 else ()
     message (STATUS "DirectX SDK not found. This is not fatal if a recent Windows SDK is installed")
     # Set non-absolute fallback library names and assume they are found in default library directories
-    set (DIRECT3D_LIBRARY d3d9)
-    set (DIRECT3D_COMPILER_LIBRARY d3dcompiler)
+    set (DIRECT3D_LIBRARIES d3d9)
+    set (DIRECT3D_COMPILER_LIBRARIES d3dcompiler)
 endif ()
 
-mark_as_advanced (DIRECT3D_INCLUDE_DIR DIRECT3D_LIBRARY DIRECT3D_COMPILER_LIBRARY)
+mark_as_advanced (DIRECT3D_INCLUDE_DIRS DIRECT3D_LIBRARIES DIRECT3D_COMPILER_LIBRARIES)

Source/CMake/Modules/FindUrho3D.cmake

@@ -24,7 +24,7 @@
 # For project root tree detection to work, Urho3D library must be already been built
 #
 #  URHO3D_FOUND
-#  URHO3D_INCLUDE_DIR
+#  URHO3D_INCLUDE_DIRS
 #  URHO3D_LIBRARIES
 #
 
@@ -60,16 +60,16 @@ if (URHO3D_HOME)
     find_file (SOURCE_TREE_PATH Urho3D.h.in ${URHO3D_HOME}/Source/Engine NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
     if (SOURCE_TREE_PATH)
         get_filename_component (SOURCE_TREE_PATH ${SOURCE_TREE_PATH} PATH)
-        set (URHO3D_INCLUDE_DIR ${SOURCE_TREE_PATH})
+        set (URHO3D_INCLUDE_DIRS ${SOURCE_TREE_PATH})
         foreach (DIR Audio Container Core Engine Graphics Input IO LuaScript Math Navigation Network Physics Resource Scene Script UI)
-            list (APPEND URHO3D_INCLUDE_DIR ${SOURCE_TREE_PATH}/${DIR})     # Note: variable change to list context after this
+            list (APPEND URHO3D_INCLUDE_DIRS ${SOURCE_TREE_PATH}/${DIR})     # Note: variable change to list context after this
         endforeach ()
         set (DIRS Bullet/src kNet/include SDL/include)
         if (ENABLE_ANGELSCRIPT)
             list (APPEND DIRS AngelScript/include)
         endif ()
         foreach (DIR ${DIRS})
-            list (APPEND URHO3D_INCLUDE_DIR ${URHO3D_HOME}/Source/ThirdParty/${DIR})
+            list (APPEND URHO3D_INCLUDE_DIRS ${URHO3D_HOME}/Source/ThirdParty/${DIR})
         endforeach ()
 
         # For non Urho3D project using Urho3D as external library, Urho3D project itself must be built using predefined build directory as per specified in the provided build scripts.
@@ -80,7 +80,7 @@ if (URHO3D_HOME)
         else ()
             set (BINARY_DIR ${URHO3D_HOME}/${PLATFORM_PREFIX}Build)
         endif () 
-        list (APPEND URHO3D_INCLUDE_DIR ${BINARY_DIR}/Engine)
+        list (APPEND URHO3D_INCLUDE_DIRS ${BINARY_DIR}/Engine)
         if (ANDROID)
             if (IS_INTERNAL)
                 set (URHO3D_LIB_SEARCH_PATH ${ANDROID_LIBRARY_OUTPUT_PATH})
@@ -117,22 +117,22 @@ else ()
         set (URHO3D_INC_SEARCH_PATH /opt/include)
         set (URHO3D_LIB_SEARCH_PATH /opt/lib)
     endif ()
-    find_path (URHO3D_INCLUDE_DIR Urho3D.h PATHS ${URHO3D_INC_SEARCH_PATH} PATH_SUFFIXES ${PATH_SUFFIX})
+    find_path (URHO3D_INCLUDE_DIRS Urho3D.h PATHS ${URHO3D_INC_SEARCH_PATH} PATH_SUFFIXES ${PATH_SUFFIX})
     find_library (URHO3D_LIBRARIES NAMES ${URHO3D_LIB_NAMES} PATHS ${URHO3D_LIB_SEARCH_PATH} PATH_SUFFIXES ${PATH_SUFFIX})
 
-    if (URHO3D_INCLUDE_DIR)
-        set (BASE_DIR ${URHO3D_INCLUDE_DIR})
+    if (URHO3D_INCLUDE_DIRS)
+        set (BASE_DIR ${URHO3D_INCLUDE_DIRS})
         set (DIRS Bullet kNet SDL)
         if (ENABLE_ANGELSCRIPT)
             list (APPEND DIRS AngelScript)
         endif ()
         foreach (DIR ${DIRS})
-            list (APPEND URHO3D_INCLUDE_DIR ${BASE_DIR}/${DIR})     # Note: variable change to list context after this, so we need BASE_DIR to remain the same
+            list (APPEND URHO3D_INCLUDE_DIRS ${BASE_DIR}/${DIR})     # Note: variable change to list context after this, so we need BASE_DIR to remain the same
         endforeach ()
     endif ()
 endif ()
 
-if (URHO3D_INCLUDE_DIR AND URHO3D_LIBRARIES)
+if (URHO3D_INCLUDE_DIRS AND URHO3D_LIBRARIES)
     set (URHO3D_FOUND 1)
     if (NOT FOUND_MESSAGE)
         set (FOUND_MESSAGE "Found Urho3D: ${URHO3D_LIBRARIES}")
@@ -141,7 +141,7 @@ endif ()
 
 if (URHO3D_FOUND)
     include (FindPackageMessage)
-    FIND_PACKAGE_MESSAGE (Urho3D ${FOUND_MESSAGE} "[${URHO3D_LIBRARIES}][${URHO3D_INCLUDE_DIR}]")
+    FIND_PACKAGE_MESSAGE (Urho3D ${FOUND_MESSAGE} "[${URHO3D_LIBRARIES}][${URHO3D_INCLUDE_DIRS}]")
 else ()
     if (Urho3D_FIND_REQUIRED)
         message (FATAL_ERROR
@@ -151,4 +151,4 @@ else ()
     endif ()
 endif ()
 
-mark_as_advanced (URHO3D_INCLUDE_DIR URHO3D_LIBRARIES)
+mark_as_advanced (URHO3D_INCLUDE_DIRS URHO3D_LIBRARIES)

Source/CMake/Modules/Urho3D-CMake-magic.cmake

@@ -141,14 +141,14 @@ endif ()
 if (MSVC)
     find_package (Direct3D)
     if (DIRECT3D_FOUND)
-        include_directories (${DIRECT3D_INCLUDE_DIR})
+        include_directories (${DIRECT3D_INCLUDE_DIRS})
     endif ()
 endif ()
 
 # For Raspbery Pi, find Broadcom VideoCore IV firmware
 if (RASPI)
     find_package (BCM_VC REQUIRED)
-    include_directories (${BCM_VC_INCLUDE_DIR})    
+    include_directories (${BCM_VC_INCLUDE_DIRS})
 endif ()
 
 # Platform and compiler specific options
@@ -599,10 +599,10 @@ macro (define_dependency_libs TARGET)
                 list (APPEND LINK_LIBS_ONLY GL)
             endif ()
         else ()
-            if (IS_ABSOLUTE ${DIRECT3D_LIBRARY})
-                list (APPEND ABSOLUTE_PATH_LIBS ${DIRECT3D_LIBRARY})
+            if (IS_ABSOLUTE ${DIRECT3D_LIBRARIES})
+                list (APPEND ABSOLUTE_PATH_LIBS ${DIRECT3D_LIBRARIES})
             else ()
-                list (APPEND LINK_LIBS_ONLY ${DIRECT3D_LIBRARY})
+                list (APPEND LINK_LIBS_ONLY ${DIRECT3D_LIBRARIES})
             endif ()
         endif ()
 

Source/CMake/Toolchains/raspberrypi.toolchain.cmake

@@ -50,7 +50,7 @@ if (NOT CMAKE_CXX_COMPILER)
 endif ()
 
 # specify the system root
-if (NOT BCM_VC_INCLUDE_DIR)
+if (NOT BCM_VC_INCLUDE_DIRS)
     # Keep invalidating the cache until we found the BCM library and its include directory which hopefully also mean we have found the correct SYSROOT
     unset (RASPI_SYSROOT CACHE)
     unset (CMAKE_INSTALL_PREFIX CACHE)

Source/Engine/CMakeLists.txt

@@ -216,7 +216,7 @@ if (NOT ANDROID AND NOT IOS)
         string (REPLACE ";" " -I" GLOBAL_INCLUDE_DIRS ";${GLOBAL_INCLUDE_DIRS}")
         string (REPLACE "${SYSROOT}" "" GLOBAL_INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS})
     endif ()
-    string (REPLACE ";" " -I\${includedir}/" URHO3D_INCLUDE_DIRS "-I\${includedir};${INSTALL_INCLUDE_DIRS}")
+    string (REPLACE ";" " -I\${includedir}/" ENGINE_INCLUDE_DIRS "-I\${includedir};${INSTALL_INCLUDE_DIRS}")
     configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Urho3D.pc.in ${CMAKE_CURRENT_BINARY_DIR}/Urho3D.pc @ONLY)
     install (FILES ${CMAKE_CURRENT_BINARY_DIR}/Urho3D.pc DESTINATION ${DEST_PKGCONFIG_DIR})
 endif ()

Source/Engine/Urho3D.pc.in

@@ -35,4 +35,4 @@ Description: Urho3D is a lightweight, cross-platform rendering and game engine i
 Version: 1.3.0
 URL: https://code.google.com/p/urho3d/
 Libs: @CMAKE_EXE_LINKER_FLAGS@ @URHO3D_ABS_PATH_LIBS@ -L${libdir} @URHO3D_LIBS@
-Cflags: @URHO3D_COMPILE_DEFINITIONS@ @CMAKE_CXX_FLAGS@ @GLOBAL_INCLUDE_DIRS@ @URHO3D_INCLUDE_DIRS@
+Cflags: @URHO3D_COMPILE_DEFINITIONS@ @CMAKE_CXX_FLAGS@ @GLOBAL_INCLUDE_DIRS@ @ENGINE_INCLUDE_DIRS@

Source/Extras/CMakeLists.txt

@@ -25,7 +25,7 @@ project (Urho3D-Extras)
 
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
-include_directories (${URHO3D_INCLUDE_DIR})
+include_directories (${URHO3D_INCLUDE_DIRS})
 
 # Urho3D extras
 add_subdirectory (OgreBatchConverter)

Source/Samples/CMakeLists.txt

@@ -25,7 +25,7 @@ project (Urho3D-Samples)
 
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
-include_directories (${URHO3D_INCLUDE_DIR})
+include_directories (${URHO3D_INCLUDE_DIRS})
 
 # Include common to all samples
 set (COMMON_SAMPLE_H_FILES "${CMAKE_CURRENT_SOURCE_DIR}/Sample.h" "${CMAKE_CURRENT_SOURCE_DIR}/Sample.inl")

Source/Tools/CMakeLists.txt

@@ -25,7 +25,7 @@ project (Urho3D-Tools)
 
 # Find Urho3D library
 find_package (Urho3D REQUIRED)
-include_directories (${URHO3D_INCLUDE_DIR})
+include_directories (${URHO3D_INCLUDE_DIRS})
 
 # Urho3DPlayer application
 add_subdirectory (Urho3DPlayer)

Source/Tools/ShaderCompiler/CMakeLists.txt

@@ -29,7 +29,7 @@ define_source_files ()
 # Define dependency libs
 add_subdirectory (../../ThirdParty/MojoShader ../../ThirdParty/MojoShader)
 set (LIBS ../../ThirdParty/MojoShader)
-set (ABSOLUTE_PATH_LIBS ${DIRECT3D_COMPILER_LIBRARY})
+set (ABSOLUTE_PATH_LIBS ${DIRECT3D_COMPILER_LIBRARIES})
 
 # Setup target
 add_definitions (-DMOJOSHADER_NO_VERSION_INCLUDE)