Browse Source

Capitalize name of CMake script directory.

Lasse Öörni 12 years ago
parent
commit
a899f7293e

+ 2 - 2
Docs/GettingStarted.dox

@@ -338,7 +338,7 @@ if (COMMAND cmake_policy)
 endif ()
 endif ()
 
 
 # Add cmake modules search path
 # Add cmake modules search path
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/Modules/")
 
 
 # Include Urho3D cmake module
 # Include Urho3D cmake module
 include (Urho3D-CMake-magic)
 include (Urho3D-CMake-magic)
@@ -360,7 +360,7 @@ set (SOURCE_FILES ${CPP_FILES} ${H_FILES})
 setup_main_executable ()
 setup_main_executable ()
 \endcode
 \endcode
 
 
-Copy the "cmake" sub-directory from Urho3D project to your own project so that CMake can find the Urho3D-specific CMake modules in your project. Instead of copying, for platform that supports symbolic link, you can also create "cmake" symbolic link in your project build tree to point to "cmake" sub-directory from Urho3D project. Alternatively, you can just modify the CMAKE_MODULE_PATH search path above to "$ENV{URHO3D_HOME}/Source/cmake/Modules/".       
+Copy the "cmake" sub-directory from Urho3D project to your own project so that CMake can find the Urho3D-specific CMake modules in your project. Instead of copying, for platform that supports symbolic link, you can also create "cmake" symbolic link in your project build tree to point to "cmake" sub-directory from Urho3D project. Alternatively, you can just modify the CMAKE_MODULE_PATH search path above to "$ENV{URHO3D_HOME}/Source/CMake/Modules/".       
 
 
 Since your CMake build script include the Urho3D-Cmake-magic module, your project also now has the cross-platform build capability.  
 Since your CMake build script include the Urho3D-Cmake-magic module, your project also now has the cross-platform build capability.  
 
 

+ 0 - 0
Source/cmake/Modules/FindBCM_VC.cmake → Source/CMake/Modules/FindBCM_VC.cmake


+ 0 - 0
Source/cmake/Modules/FindDirect3D.cmake → Source/CMake/Modules/FindDirect3D.cmake


+ 0 - 0
Source/cmake/Modules/FindUrho3D.cmake → Source/CMake/Modules/FindUrho3D.cmake


+ 0 - 0
Source/cmake/Modules/Urho3D-CMake-magic.cmake → Source/CMake/Modules/Urho3D-CMake-magic.cmake


+ 0 - 0
Source/cmake/Toolchains/android.toolchain.cmake → Source/CMake/Toolchains/android.toolchain.cmake


+ 0 - 0
Source/cmake/Toolchains/raspberrypi.toolchain.cmake → Source/CMake/Toolchains/raspberrypi.toolchain.cmake


+ 1 - 1
Source/CMakeLists.txt

@@ -31,7 +31,7 @@ if (COMMAND cmake_policy)
 endif ()
 endif ()
 
 
 # Add cmake modules search path
 # Add cmake modules search path
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/Modules/")
 
 
 # Include Urho3D cmake module
 # Include Urho3D cmake module
 include (Urho3D-CMake-magic)
 include (Urho3D-CMake-magic)

+ 1 - 1
cmake_android.bat

@@ -24,4 +24,4 @@ if "%use_mklink%" == "1" (
 )
 )
 cmake -E copy_if_different Docs\Doxyfile.in Doxyfile
 cmake -E copy_if_different Docs\Doxyfile.in Doxyfile
 echo on
 echo on
-cmake -E chdir %build% cmake -G "Unix Makefiles" -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=%source%\cmake\Toolchains\android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=. %source% %*
+cmake -E chdir %build% cmake -G "Unix Makefiles" -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=%source%\CMake\Toolchains\android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=. %source% %*

+ 2 - 2
cmake_gcc.sh

@@ -29,8 +29,8 @@ GENERATOR="Unix Makefiles"
 # Create project with the respective Cmake generators
 # Create project with the respective Cmake generators
 OPT=--no-warn-unused-cli
 OPT=--no-warn-unused-cli
 msg "Native build" && cmake -E chdir Build cmake $OPT -G $GENERATOR $PLATFORM $SOURCE $@
 msg "Native build" && cmake -E chdir Build cmake $OPT -G $GENERATOR $PLATFORM $SOURCE $@
-[ $RASPI_TOOL ] && msg "Raspberry Pi build" && cmake -E chdir raspi-Build cmake $OPT -G $GENERATOR -DRASPI=1 -DCMAKE_TOOLCHAIN_FILE=$SOURCE/cmake/Toolchains/raspberrypi.toolchain.cmake $SOURCE $@
-[ $ANDROID_NDK ] && msg "Android build" && cmake -E chdir android-Build cmake $OPT -G $GENERATOR -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=$SOURCE/cmake/Toolchains/android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=. $SOURCE $@
+[ $RASPI_TOOL ] && msg "Raspberry Pi build" && cmake -E chdir raspi-Build cmake $OPT -G $GENERATOR -DRASPI=1 -DCMAKE_TOOLCHAIN_FILE=$SOURCE/CMake/Toolchains/raspberrypi.toolchain.cmake $SOURCE $@
+[ $ANDROID_NDK ] && msg "Android build" && cmake -E chdir android-Build cmake $OPT -G $GENERATOR -DANDROID=1 -DCMAKE_TOOLCHAIN_FILE=$SOURCE/CMake/Toolchains/android.toolchain.cmake -DLIBRARY_OUTPUT_PATH_ROOT=. $SOURCE $@
 unset IFS
 unset IFS
 
 
 # Assume GCC user uses OpenGL, comment out below sed if this is not true
 # Assume GCC user uses OpenGL, comment out below sed if this is not true