commit fbfdbc23ab144e88d0e017ed664273f9866bd007
author Henry Herman <henryherman@google.com> Mon Jun 28 22:01:25 2021 +0000
committer Henry Herman <henryherman@google.com> Mon Jun 28 22:01:25 2021 +0000
tree 1e6ecf7d147ee7cc4433aeca63e1428c3dbf2f7c
parent 2f671fcdad4c2abb0fa25e72c55db8fec23f76b6

Move Pigweed include to toplevel CMakeLists.txt.

Change-Id: Ie05fd6827736ac542c1d93bf49a1afee0453275c

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index facba34..6e3a227 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,13 @@
 
 enable_language(ASM)
 
+include($ENV{ROOTDIR}/sw/pigweed/pw_build/pigweed.cmake)
+pw_set_backend(pw_log pw_log_basic)
+pw_set_backend(pw_assert pw_assert_log)
+pw_set_backend(pw_sys_io pw_sys_io_stdio)
+
+add_subdirectory($ENV{ROOTDIR}/sw/pigweed pw)
+
 set(LINKER_SCRIPT "${CMAKE_CURRENT_SOURCE_DIR}/springbok/matcha.ld")
 
 add_subdirectory(springbok)

pw_unit_test_demo/CMakeLists.txt

diff --git a/pw_unit_test_demo/CMakeLists.txt b/pw_unit_test_demo/CMakeLists.txt
index 60cb1ab..3bfaee0 100644
--- a/pw_unit_test_demo/CMakeLists.txt
+++ b/pw_unit_test_demo/CMakeLists.txt
@@ -1,12 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
 
-include($ENV{ROOTDIR}/sw/pigweed/pw_build/pigweed.cmake)
-pw_set_backend(pw_log pw_log_basic)
-pw_set_backend(pw_assert pw_assert_log)
-pw_set_backend(pw_sys_io pw_sys_io_stdio)
-
-add_subdirectory($ENV{ROOTDIR}/sw/pigweed pw)
-
 project(pw_unit_test_demo)
 set (CMAKE_CXX_STANDARD 17)