|
|
@@ -78,7 +78,7 @@ else ()
|
|
|
option (URHO3D_64BIT "Enable 64-bit build, on MSVC default to 0, on other compilers the default is set based on the 64-bit capability of the chosen toolchain on host system" ${URHO3D_DEFAULT_64BIT})
|
|
|
endif ()
|
|
|
cmake_dependent_option (URHO3D_ANGELSCRIPT "Enable AngelScript scripting support" TRUE "NOT EMSCRIPTEN" FALSE)
|
|
|
-option (URHO3D_LUA "Enable additional Lua scripting support")
|
|
|
+option (URHO3D_LUA "Enable additional Lua scripting support" TRUE)
|
|
|
cmake_dependent_option (URHO3D_LUAJIT "Enable Lua scripting support using LuaJIT (check LuaJIT's CMakeLists.txt for more options)" FALSE "NOT EMSCRIPTEN" FALSE)
|
|
|
option (URHO3D_NAVIGATION "Enable navigation support" TRUE)
|
|
|
cmake_dependent_option (URHO3D_NETWORK "Enable networking support" TRUE "NOT EMSCRIPTEN" FALSE)
|
|
|
@@ -116,7 +116,7 @@ if (CMAKE_PROJECT_NAME STREQUAL Urho3D)
|
|
|
set (URHO3D_DEFAULT_LUA_RAW TRUE)
|
|
|
endif ()
|
|
|
cmake_dependent_option (URHO3D_LUA_RAW_SCRIPT_LOADER "Prefer loading raw script files from the file system before falling back on Urho3D resource cache. Useful for debugging (e.g. breakpoints), but less performant (Lua/LuaJIT only)" ${URHO3D_DEFAULT_LUA_RAW} "URHO3D_LUA OR URHO3D_LUAJIT" FALSE)
|
|
|
- option (URHO3D_SAMPLES "Build sample applications")
|
|
|
+ option (URHO3D_SAMPLES "Build sample applications" TRUE)
|
|
|
option (URHO3D_UPDATE_SOURCE_TREE "Enable commands to copy back some of the generated build artifacts from build tree to source tree to facilitate devs to push them as part of a commit (for library devs with push right only)")
|
|
|
option (URHO3D_BINDINGS "Enable API binding generation support for script subystems")
|
|
|
cmake_dependent_option (URHO3D_CLANG_TOOLS "Build Clang tools (native only)" FALSE "NOT RPI AND NOT IOS AND NOT ANDROID AND NOT EMSCRIPTEN" FALSE)
|
|
|
@@ -126,7 +126,7 @@ if (CMAKE_PROJECT_NAME STREQUAL Urho3D)
|
|
|
option (URHO3D_DOCS "Generate documentation as part of normal build")
|
|
|
option (URHO3D_DOCS_QUIET "Generate documentation as part of normal build, suppress generation process from sending anything to stdout")
|
|
|
option (URHO3D_PCH "Enable PCH support" TRUE)
|
|
|
- option (URHO3D_DATABASE_SQLITE "Enable Database support with SQLite embedded" FALSE)
|
|
|
+ option (URHO3D_DATABASE_SQLITE "Enable Database support with SQLite embedded")
|
|
|
cmake_dependent_option (URHO3D_MINIDUMPS "Enable minidumps on crash (VS only)" TRUE "MSVC" FALSE)
|
|
|
option (URHO3D_FILEWATCHER "Enable filewatcher support" TRUE)
|
|
|
if (CPACK_SYSTEM_NAME STREQUAL Linux)
|
|
|
@@ -1704,18 +1704,26 @@ elseif (EMSCRIPTEN)
|
|
|
string (REPLACE "<body>" "<body>\n\n<a href=\"http://urho3d.github.io\" title=\"Urho3D Homepage\"><img src=\"http://urho3d.github.io/assets/images/logo.png\" alt=\"link to http://urho3d.github.io\" height=\"80\" width=\"320\" /></a>\n" SHELL_HTML "${SHELL_HTML}")
|
|
|
file (WRITE ${CMAKE_BINARY_DIR}/Source/shell.html "${SHELL_HTML}")
|
|
|
endif ()
|
|
|
-elseif (NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_WIN32 AND "$ENV{USE_CCACHE}")
|
|
|
+else ()
|
|
|
+ # Create symbolic links in the build tree
|
|
|
+ foreach (I CoreData Data)
|
|
|
+ if (NOT EXISTS ${CMAKE_BINARY_DIR}/bin/${I})
|
|
|
+ create_symlink (${CMAKE_SOURCE_DIR}/bin/${I} ${CMAKE_BINARY_DIR}/bin/${I} FALLBACK_TO_COPY)
|
|
|
+ endif ()
|
|
|
+ endforeach ()
|
|
|
# Warn user if PATH environment variable has not been correctly set for using ccache
|
|
|
- if (APPLE)
|
|
|
- set (WHEREIS brew info ccache)
|
|
|
- else ()
|
|
|
- set (WHEREIS whereis -b ccache)
|
|
|
- endif ()
|
|
|
- execute_process (COMMAND ${WHEREIS} COMMAND grep -o \\S*lib\\S* RESULT_VARIABLE EXIT_CODE OUTPUT_VARIABLE CCACHE_SYMLINK ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
- if (EXIT_CODE EQUAL 0 AND NOT $ENV{PATH} MATCHES "${CCACHE_SYMLINK}") # Need to stringify because CCACHE_SYMLINK variable could be empty when the command failed
|
|
|
- message (WARNING "The lib directory containing the ccache symlinks (${CCACHE_SYMLINK}) has not been added in the PATH environment variable. "
|
|
|
- "This is required to enable ccache support for native compiler toolchain. CMake has been configured to use the actual compiler toolchain instead of ccache. "
|
|
|
- "In order to rectify this, the build tree must be regenerated after the PATH environment variable has been adjusted accordingly.")
|
|
|
+ if (NOT CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_WIN32 AND "$ENV{USE_CCACHE}")
|
|
|
+ if (APPLE)
|
|
|
+ set (WHEREIS brew info ccache)
|
|
|
+ else ()
|
|
|
+ set (WHEREIS whereis -b ccache)
|
|
|
+ endif ()
|
|
|
+ execute_process (COMMAND ${WHEREIS} COMMAND grep -o \\S*lib\\S* RESULT_VARIABLE EXIT_CODE OUTPUT_VARIABLE CCACHE_SYMLINK ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
+ if (EXIT_CODE EQUAL 0 AND NOT $ENV{PATH} MATCHES "${CCACHE_SYMLINK}") # Need to stringify because CCACHE_SYMLINK variable could be empty when the command failed
|
|
|
+ message (WARNING "The lib directory containing the ccache symlinks (${CCACHE_SYMLINK}) has not been added in the PATH environment variable. "
|
|
|
+ "This is required to enable ccache support for native compiler toolchain. CMake has been configured to use the actual compiler toolchain instead of ccache. "
|
|
|
+ "In order to rectify this, the build tree must be regenerated after the PATH environment variable has been adjusted accordingly.")
|
|
|
+ endif ()
|
|
|
endif ()
|
|
|
endif ()
|
|
|
|
Yao Wei Tjong 姚伟忠