Merge remote-tracking branch 'technyon/release-1.1-dev'

Author: KSDaemon

Arduino-toolchain.cmake

@@ -49,39 +49,81 @@ set(CMAKE_SYSTEM_NAME "Arduino")
 set(ARDUINO_TOOLCHAIN_DIR "${CMAKE_CURRENT_LIST_DIR}")
 set(_ARDUINO_TOOLCHAIN_PARENT "${CMAKE_PARENT_LIST_FILE}")
 set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_CURRENT_LIST_DIR}")
-set (ARDUINO_TOOLCHAIN_VERSION "1.0")
+set (ARDUINO_TOOLCHAIN_VERSION "1.1")
 
 # Include modules
+include(Arduino/System/PackagePathIndex)
+include(Arduino/System/PackageIndex)
 include(Arduino/System/BoardsIndex)
 include(Arduino/System/BoardToolchain)
 include(Arduino/System/BoardBuildTargets)
+include(Arduino/PackageManager/BoardsManager)
 
 #*****************************************************************************
-# For improved speed, indexing of boards is done only once during a 
-# cmake invocation. However, this toolchain file is included multiple
-# times in multiple contexts (system determination context, separate
-# context for each try compile etc.). After indexing, the selected
-# board's toolchain info is configured to a generated file that gets
-# included in every other inclusion of this toolchain.
-if (NOT _BOARD_INDEXING_COMPLETED)
+# For improved speed, indexing and setup of boards is done only once during a
+# cmake invocation. However, this toolchain file is included multiple times
+# in multiple contexts (system determination context, separate context for
+# each try compile etc.). After indexing, the selected board's toolchain
+# info is configured to a generated file that gets included in every other
+# inclusion of this toolchain.
+if (NOT _BOARD_SETUP_COMPLETED)
 	get_property(_in_try_compile GLOBAL PROPERTY IN_TRY_COMPILE)
-	# IN_TRY_COMPILE check seems to be not enough. Check for parent
-	# script works, but may be undocumented!
-	get_filename_component(parent_script "${_ARDUINO_TOOLCHAIN_PARENT}" NAME_WE)
+	# IN_TRY_COMPILE check seems to be not enough. Checking for parent
+	# script works, but might be using undocumented feature?
+	get_filename_component(parent_script "${_ARDUINO_TOOLCHAIN_PARENT}"
+		NAME_WE)
 	if (parent_script STREQUAL "CMakeSystem")
 		check_board_options_changed(_b_changed)
 		if (NOT _b_changed)
-			set(_BOARD_INDEXING_COMPLETED TRUE)
+			set(_BOARD_SETUP_COMPLETED TRUE)
 		endif()
+	elseif(ARDUINO_SYSTEM_FILE)
+		# If passing with pre-generated Arduino system code
+		set(_BOARD_SETUP_COMPLETED TRUE)
+		set(CMAKE_SYSTEM_CUSTOM_CODE
+			"include(\"${ARDUINO_SYSTEM_FILE}\")"
+		)
 	endif()
 endif()
 
-if (NOT _BOARD_INDEXING_COMPLETED)
-	SetupBoardToolchain()
+# Wrap it in a function so that the scope of variables are within
+# the function
+function(BoardSetupWorkflow)
+
+	# Call the common workflow for setting up the platform, which includes
+	# installing the necessary platform (if package management is enabled),
+	# and indexing the boards based on the platform. The platform to be
+	# setup is identified using the board options which we already loaded.
+	PlatformSetupWorkflow()
+
+	# Select one of the boards as selected in BoardOptions.cmake or in
+	# cmake-gui or other mechanisms. If none selected, this call will
+	# generate options in CMake Cache and BoardOptions.cmake to allow
+	# later selection of the board.
+	SelectArduinoBoard(ard_boards)
+	set(ARDUINO_BOARD_IDENTIFIER "${ARDUINO_BOARD_IDENTIFIER}"
+		PARENT_SCOPE)
+	list(LENGTH ARDUINO_BOARD_IDENTIFIER _num_board_ids)
+
+	# if a board is selected, setup a toolchain for the board
+	# Else, Arduino-Determine.cmake will print an error message later
+	# Arduino-Determine.cmake.
+	if (_num_board_ids EQUAL 1)
+		SetupBoardToolchain(ard_boards "${ARDUINO_BOARD_IDENTIFIER}"
+			"${CMAKE_BINARY_DIR}")
+	endif()
+
+endfunction()
+
+if (NOT _BOARD_SETUP_COMPLETED)
+
+	BoardSetupWorkflow()
+
 	set(CMAKE_SYSTEM_CUSTOM_CODE
 		"include(\"${CMAKE_BINARY_DIR}/ArduinoSystem.cmake\")"
 	)
-	set (_BOARD_INDEXING_COMPLETED TRUE)
+	set (_BOARD_SETUP_COMPLETED TRUE)
+
 endif()
 
 # Search for programs in the build host directories
@@ -94,7 +136,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/build_opt.h" "")
 
 # Do not try to link during the configure time, due to the dependency on the
-# core, which we do not have a target yet.
-set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+# core for some platforms, which we do not have a target yet.
+if (NOT "${ARDUINO_TRY_STANDALONE_TOOLCHAIN}")
+	set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
+endif()
 
 cmake_policy(POP)