Skip to content

Commit f031655

Browse files
committed
tooling: Remove obsolete conan layout file
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
1 parent 0ac5224 commit f031655

File tree

2 files changed

+1
-16
lines changed

2 files changed

+1
-16
lines changed

.conan-layout.ini

-14
This file was deleted.

Makefile.package

+1-2
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ BUILD_DIR := build
8181
BUILD_CONANINFO := ${BUILD_DIR}/conanbuildinfo.txt
8282
BUILD_CMAKECACHE := ${BUILD_DIR}/CMakeCache.txt
8383
BUILD_LOCKFILE := ${BUILD_DIR}/conan.lock
84-
BUILD_LAYOUT := ${PROJECT_ROOT}/.conan-layout.ini
8584

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

339338
.PHONY: uneditable
340339
uneditable:

0 commit comments

Comments
 (0)