From 94ec7c46a51b7bb1fe5f3e64a2f90fb8b3a0ade1 Mon Sep 17 00:00:00 2001 From: Roelf-Jilling Date: Mon, 19 Nov 2018 19:35:00 +0100 Subject: Add note, to delete the CMake cache, after editing a configuration. --- docs/examples/using-sqlite.md | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/examples') diff --git a/docs/examples/using-sqlite.md b/docs/examples/using-sqlite.md index 35da141d0..e622b9039 100644 --- a/docs/examples/using-sqlite.md +++ b/docs/examples/using-sqlite.md @@ -109,6 +109,7 @@ If you are using CMake through Open Folder with Visual Studio 2017 you can defin }] } ``` +*Note: It might be necessary to delete the CMake cache folder of each modified configuration, to force a full regeneration. In the `CMake` menu, under `Cache ()` you'll find `Delete Cache Folders`.* Now let's make a simple CMake project with a main file. ```cmake -- cgit v1.2.3 From 381e4c94af038bd0ff364ddec918ea077c405ecf Mon Sep 17 00:00:00 2001 From: Roelf-Jilling Date: Mon, 19 Nov 2018 19:47:31 +0100 Subject: Move -DCMAKE_... to a new line to prevent the line-break after the dash. --- docs/examples/using-sqlite.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/examples') diff --git a/docs/examples/using-sqlite.md b/docs/examples/using-sqlite.md index e622b9039..eb03d57d2 100644 --- a/docs/examples/using-sqlite.md +++ b/docs/examples/using-sqlite.md @@ -89,7 +89,8 @@ To remove the integration for your user, you can use `.\vcpkg integrate remove`. #### CMake (Toolchain File) -The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as `-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. +The best way to use installed libraries with cmake is via the toolchain file `scripts\buildsystems\vcpkg.cmake`. To use this file, you simply need to add it onto your CMake command line as: +`-DCMAKE_TOOLCHAIN_FILE=D:\src\vcpkg\scripts\buildsystems\vcpkg.cmake`. If you are using CMake through Open Folder with Visual Studio 2017 you can define `CMAKE_TOOLCHAIN_FILE` by adding a "variables" section to each of your `CMakeSettings.json` configurations: -- cgit v1.2.3 From 7a18088cf2c513863761200b0d01f20be8bfa2c2 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Fri, 15 Feb 2019 14:32:07 -0800 Subject: [vcpkg create, docs] Update create command's template and documentation on patching (#5370) --- docs/examples/patching.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/examples') diff --git a/docs/examples/patching.md b/docs/examples/patching.md index 98115400e..b152231e2 100644 --- a/docs/examples/patching.md +++ b/docs/examples/patching.md @@ -147,11 +147,11 @@ Finally, we need to apply the patch after extracting the source. ```cmake # ports\libpng\portfile.cmake ... -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libpng-1.6.24 - PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + "use-abort-on-all-platforms.patch" ) vcpkg_configure_cmake( -- cgit v1.2.3