|
|
@@ -2,16 +2,7 @@
|
|
|
#
|
|
|
cmake_minimum_required(VERSION 3.5)
|
|
|
|
|
|
-#
|
|
|
-# Verify the project configured the environment correctly
|
|
|
-#
|
|
|
-if(NOT ( ${CMAKE_SYSTEM_NAME} STREQUAL "Generic" AND ${CMAKE_C_COMPILER} MATCHES xtensa))
|
|
|
- message(FATAL_ERROR "The parent project CMakeLists.txt file needs to set CMAKE_TOOLCHAIN_FILE "
|
|
|
- "before including this file. "
|
|
|
- "Update CMakeLists.txt to match the template project and delete CMakeCache.txt before "
|
|
|
- "re-running cmake.")
|
|
|
-endif()
|
|
|
-
|
|
|
+# Set IDF_PATH, as nothing else will work without this
|
|
|
set(IDF_PATH "$ENV{IDF_PATH}")
|
|
|
if(NOT IDF_PATH)
|
|
|
# Documentation says you should set IDF_PATH in your environment, but we
|
|
|
@@ -20,11 +11,6 @@ if(NOT IDF_PATH)
|
|
|
set($ENV{IDF_PATH} "${IDF_PATH}")
|
|
|
endif()
|
|
|
|
|
|
-# PROJECT_PATH has the path to the IDF project (top-level cmake directory)
|
|
|
-#
|
|
|
-# (cmake calls this CMAKE_SOURCE_DIR, keeping old name for compatibility.)
|
|
|
-set(PROJECT_PATH "${CMAKE_SOURCE_DIR}")
|
|
|
-
|
|
|
#
|
|
|
# Load cmake modules
|
|
|
#
|
|
|
@@ -33,43 +19,34 @@ include(GetGitRevisionDescription)
|
|
|
include(utilities)
|
|
|
include(components)
|
|
|
include(kconfig)
|
|
|
-include(crosstool_version_check)
|
|
|
include(git_submodules)
|
|
|
include(idf_functions)
|
|
|
|
|
|
-#
|
|
|
-# Warn if the toolchain version doesn't match
|
|
|
-#
|
|
|
-gcc_version_check("5.2.0")
|
|
|
-crosstool_version_check("1.22.0-80-g6c4433a")
|
|
|
-
|
|
|
-#
|
|
|
-# Configure optional variables
|
|
|
-#
|
|
|
-set_default(EXTRA_COMPONENT_DIRS "")
|
|
|
+# Verify the environment is configured correctly
|
|
|
+idf_verify_environment()
|
|
|
|
|
|
-# Note: "main" is no longer a component...
|
|
|
-#
|
|
|
-set_default(COMPONENT_DIRS "${PROJECT_PATH}/components ${EXTRA_COMPONENT_DIRS} ${IDF_PATH}/components")
|
|
|
-spaces2list(COMPONENT_DIRS)
|
|
|
+# Set global variables used by rest of the build
|
|
|
+idf_set_global_variables()
|
|
|
|
|
|
-spaces2list(COMPONENTS)
|
|
|
# Search COMPONENT_DIRS for COMPONENTS, make a list of full paths to each component in COMPONENT_PATHS
|
|
|
-find_all_components("${COMPONENT_DIRS}" "${COMPONENTS}" COMPONENT_PATHS COMPONENTS)
|
|
|
-build_component_config()
|
|
|
+components_find_all("${COMPONENT_DIRS}" "${COMPONENTS}" COMPONENT_PATHS COMPONENTS)
|
|
|
+
|
|
|
+kconfig_set_variables()
|
|
|
+
|
|
|
+kconfig_process_config()
|
|
|
|
|
|
# Include sdkconfig.cmake so rest of the build knows the configuration
|
|
|
include(${SDKCONFIG_CMAKE})
|
|
|
|
|
|
-#
|
|
|
# Add some idf-wide definitions
|
|
|
idf_set_global_compiler_options()
|
|
|
|
|
|
+# Check git version (may trigger reruns of cmake)
|
|
|
+# & set GIT_REVISION/IDF_VER variable
|
|
|
git_describe(GIT_REVISION)
|
|
|
add_definitions(-DIDF_VER=\"${GIT_REVISION}\")
|
|
|
git_submodule_check("${IDF_PATH}")
|
|
|
|
|
|
-add_compile_options("-I${CMAKE_BINARY_DIR}") # for sdkconfig.h
|
|
|
|
|
|
#
|
|
|
# Add components to the build
|
|
|
@@ -79,10 +56,9 @@ foreach(component ${COMPONENT_PATHS})
|
|
|
add_subdirectory(${component} ${component_name})
|
|
|
endforeach()
|
|
|
|
|
|
-finish_component_registration()
|
|
|
+components_finish_registration()
|
|
|
|
|
|
# Load the targets for the bootloader subproject
|
|
|
if(NOT BOOTLOADER_BUILD)
|
|
|
include(bootloader_subproject)
|
|
|
endif()
|
|
|
-
|
Angus Gratton