Skip to content

Commit 0bafb1b

Browse files
committed
Use conanfile.py across the board
1 parent 97f2776 commit 0bafb1b

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.github/workflows/cmake_ubuntu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: Install conan dependencies
4141
working-directory: ${{github.workspace}}/build
42-
run: conan install ${{github.workspace}}/conanfile.txt -s build_type=${{env.BUILD_TYPE}} --build=missing
42+
run: conan install ${{github.workspace}}/conanfile.py -s build_type=${{env.BUILD_TYPE}} --build=missing
4343

4444
- name: Configure CMake
4545
shell: bash

.github/workflows/cmake_windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: Install conan dependencies
4141
working-directory: ${{github.workspace}}/build
42-
run: conan install ${{github.workspace}}/conanfile.txt -s build_type=${{env.BUILD_TYPE}} --build=missing
42+
run: conan install ${{github.workspace}}/conanfile.py -s build_type=${{env.BUILD_TYPE}} --build=missing
4343

4444
- name: Configure CMake
4545
shell: bash

cmake/conan.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,14 +808,14 @@ function(conan_cmake_configure)
808808
conan_cmake_generate_conanfile(OFF ${ARGV})
809809
endfunction()
810810

811-
# Generate, writing in disk a conanfile.txt with the requires, options, and imports
811+
# Generate, writing in disk a conanfile.py with the requires, options, and imports
812812
# specified as arguments
813813
# This will be considered as temporary file, generated in CMAKE_CURRENT_BINARY_DIR)
814814
function(conan_cmake_generate_conanfile DEFAULT_GENERATOR)
815815

816816
conan_parse_arguments(${ARGV})
817817

818-
set(_FN "${CMAKE_CURRENT_BINARY_DIR}/conanfile.txt")
818+
set(_FN "${CMAKE_CURRENT_BINARY_DIR}/conanfile.py")
819819
file(WRITE ${_FN} "")
820820

821821
if(DEFINED ARGUMENTS_REQUIRES)

0 commit comments

Comments
 (0)