mirror of
https://github.com/espressif/esp-protocols.git
synced 2025-09-25 22:30:55 +02:00
Merge pull request #869 from david-cermak/fix/test_build_v6.0
fix(CI): Fix test component dir after IDFv6.0 update
This commit is contained in:
@@ -1,7 +1,15 @@
|
|||||||
# The following four lines of boilerplate have to be in your project's CMakeLists
|
# The following four lines of boilerplate have to be in your project's CMakeLists
|
||||||
# in this exact order for cmake to work correctly
|
# in this exact order for cmake to work correctly
|
||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/tools/unit-test-app/components)
|
|
||||||
|
|
||||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
|
|
||||||
|
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "6.0")
|
||||||
|
set(test_component_dir $ENV{IDF_PATH}/tools/test_apps/components)
|
||||||
|
else()
|
||||||
|
set(test_component_dir $ENV{IDF_PATH}/tools/unit-test-app/components)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(EXTRA_COMPONENT_DIRS ${test_component_dir})
|
||||||
|
|
||||||
project(test_app)
|
project(test_app)
|
||||||
|
@@ -1,8 +1,15 @@
|
|||||||
# This is the project CMakeLists.txt file for the test subproject
|
# This is the project CMakeLists.txt file for the test subproject
|
||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
set(EXTRA_COMPONENT_DIRS ../../esp_websocket_client
|
|
||||||
"$ENV{IDF_PATH}/tools/unit-test-app/components")
|
|
||||||
|
|
||||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
|
|
||||||
|
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "6.0")
|
||||||
|
set(test_component_dir $ENV{IDF_PATH}/tools/test_apps/components)
|
||||||
|
else()
|
||||||
|
set(test_component_dir $ENV{IDF_PATH}/tools/unit-test-app/components)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(EXTRA_COMPONENT_DIRS ../../esp_websocket_client
|
||||||
|
${test_component_dir})
|
||||||
|
|
||||||
project(websocket_unit_test)
|
project(websocket_unit_test)
|
||||||
|
@@ -1,7 +1,15 @@
|
|||||||
# This is the project CMakeLists.txt file for the test subproject
|
# This is the project CMakeLists.txt file for the test subproject
|
||||||
cmake_minimum_required(VERSION 3.16)
|
cmake_minimum_required(VERSION 3.16)
|
||||||
|
|
||||||
set(EXTRA_COMPONENT_DIRS ../.. "$ENV{IDF_PATH}/tools/unit-test-app/components")
|
|
||||||
|
|
||||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||||
|
|
||||||
|
if("${IDF_VERSION_MAJOR}.${IDF_VERSION_MINOR}" VERSION_GREATER_EQUAL "6.0")
|
||||||
|
set(test_component_dir $ENV{IDF_PATH}/tools/test_apps/components)
|
||||||
|
else()
|
||||||
|
set(test_component_dir $ENV{IDF_PATH}/tools/unit-test-app/components)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
set(EXTRA_COMPONENT_DIRS ../..
|
||||||
|
${test_component_dir})
|
||||||
|
|
||||||
project(mdns_test)
|
project(mdns_test)
|
||||||
|
Reference in New Issue
Block a user