From c62eaefedcd88517afb4c455be336461efe126be Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Mon, 18 Nov 2019 21:38:31 -0800 Subject: Updated submodules (updated install folder structure) --- DiligentCore | 2 +- DiligentSamples | 2 +- DiligentTools | 2 +- README.md | 13 ++++++------- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/DiligentCore b/DiligentCore index 85c1414..18ac961 160000 --- a/DiligentCore +++ b/DiligentCore @@ -1 +1 @@ -Subproject commit 85c141483471794d43680c4e1af36f7b13aeeb35 +Subproject commit 18ac96186a36e7821dbd4e35ceead27e9fa829fc diff --git a/DiligentSamples b/DiligentSamples index 6b18bb8..b7c5bd7 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit 6b18bb8630bc70e30cadc87d01fcfd8495584611 +Subproject commit b7c5bd7347454f3af624365b81ba54d7a753e8df diff --git a/DiligentTools b/DiligentTools index 3137534..58b96f0 160000 --- a/DiligentTools +++ b/DiligentTools @@ -1 +1 @@ -Subproject commit 3137534d9f2262086bf02e7887483f068078fc31 +Subproject commit 58b96f03b6a101c19d2ed42f3ed57e710fccd889 diff --git a/README.md b/README.md index 2a9dbf4..a6cea70 100644 --- a/README.md +++ b/README.md @@ -418,11 +418,10 @@ Please also take a look at getting started tutorials for If your project doesn't use CMake, it is recommended to build libraries with CMake and add them to your build system. For Windows platforms, you can download the latest build artifacts from [appveyor](https://ci.appveyor.com/project/DiligentGraphics/diligentcore). -Global CMake installation directory is controlled by `CMAKE_INTALL_PREFIX` variable. Within that directory, -`DILIGENT_CORE_INSTALL_DIR` defines the subdirectory where libraries and headers are installed. -Note that [CMAKE_INTALL_PREFIX](https://cmake.org/cmake/help/v3.13/variable/CMAKE_INSTALL_PREFIX.html) defaults -to `/usr/local` on UNIX and `c:/Program Files/${PROJECT_NAME}` on Windows, which may not be what you want. -Use `-D CMAKE_INSTALL_PREFIX=install` to use local `install` folder instead: +Global CMake installation directory is controlled by +[CMAKE_INTALL_PREFIX](https://cmake.org/cmake/help/latest/variable/CMAKE_INSTALL_PREFIX.html) variable. +Note that it defaults to `/usr/local` on UNIX and `c:/Program Files/${PROJECT_NAME}` on Windows, which may not +be what you want. Use `-D CMAKE_INSTALL_PREFIX=install` to use local `install` folder instead: ``` cmake -S . -B ./build/Win64 -D CMAKE_INSTALL_PREFIX=install -G "Visual Studio 15 2017" -A x64 @@ -482,7 +481,7 @@ reduce the size of the Vulkan back-end binary. ## Customizing Build Diligent Engine allows clients to customize build settings by providing configuration script file that defines two optional -[cmake functions](https://cmake.org/cmake/help/v3.13/command/function.html): +[cmake functions](https://cmake.org/cmake/help/latest/command/function.html): * `custom_configure_build()` - defines global build properties such as build configurations, c/c++ compile flags, link flags etc. * `custom_configure_target()` - defines custom settings for every target in the build. @@ -562,7 +561,7 @@ allows configuring target-specific properties. By default, the build system sets some target properties. If `custom_configure_target()` sets all required properties, it can tell the build system that no further processing is required by setting `TARGET_CONFIGURATION_COMPLETE` -[parent scope](https://cmake.org/cmake/help/v3.13/command/set.html#set-normal-variable) variable to `TRUE`: +[parent scope](https://cmake.org/cmake/help/latest/command/set.html#set-normal-variable) variable to `TRUE`: ```cmake set(TARGET_CONFIGURATION_COMPLETE TRUE PARENT_SCOPE) -- cgit v1.2.3