Skip to content

Commit

Permalink
tooling: Remove obsolete conan layout file
Browse files Browse the repository at this point in the history
The current Conan recipes specify their own layout file,
which is also valid for editable mode. This supercedes the
Conan layout file.

See: https://docs.conan.io/1/developing_packages/package_layout.html
  • Loading branch information
cassava committed May 12, 2023
1 parent 0ac5224 commit f031655
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 16 deletions.
14 changes: 0 additions & 14 deletions .conan-layout.ini

This file was deleted.

3 changes: 1 addition & 2 deletions Makefile.package
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ BUILD_DIR := build
BUILD_CONANINFO := ${BUILD_DIR}/conanbuildinfo.txt
BUILD_CMAKECACHE := ${BUILD_DIR}/CMakeCache.txt
BUILD_LOCKFILE := ${BUILD_DIR}/conan.lock
BUILD_LAYOUT := ${PROJECT_ROOT}/.conan-layout.ini

# Default Conan build policy to use when installing Conan dependencies
# as well as creating packages. See Conan documentation for possible values.
Expand Down Expand Up @@ -334,7 +333,7 @@ editable:
#
# Run `make uneditable` to leave this mode.
#
conan editable add . --layout "${BUILD_LAYOUT}" ${PACKAGE_FQN}
conan editable add . ${PACKAGE_FQN}

.PHONY: uneditable
uneditable:
Expand Down

0 comments on commit f031655

Please sign in to comment.