From 342550504c7a7e005d50685942c704c48817310b Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Mon, 11 Apr 2022 09:34:07 +0200 Subject: [PATCH 1/2] fixup CMakeLists.txt --- CMakeLists.txt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 828e1f6..c8ddc8c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,10 +84,6 @@ find_package(elfio) find_package(fmt) find_package(gsl-lite) set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. -#set(Boost_NO_SYSTEM_PATHS ON) -#set(Boost_USE_STATIC_LIBS OFF) -#set(Boost_USE_MULTITHREADED ON) -#set(Boost_USE_STATIC_RUNTIME OFF) find_package(Boost REQUIRED COMPONENTS program_options QUIET) @@ -127,16 +123,13 @@ endif() if(NOT LIBS_ONLY) add_subdirectory(src) endif() -if(IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/plugins) - add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/plugins) -endif() if(NOT NO_FW_BUILD) add_custom_target(fw-hello-world ALL COMMAND make -C fw/hello-world USES_TERMINAL WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endif() # CTest is a testing tool that can be used to test your project. - enable_testing() - add_test(NAME tgc-vp-hello-world - #WORKING_DIRECTORY ${ecosystem-vp_DIR}/bin - COMMAND tgc-vp -f ${CMAKE_CURRENT_LIST_DIR}/fw/hello-world/prebuilt/hello.elf) +enable_testing() +add_test(NAME tgc-vp-hello-world + #WORKING_DIRECTORY ${ecosystem-vp_DIR}/bin + COMMAND tgc-vp -f ${CMAKE_CURRENT_LIST_DIR}/fw/hello-world/prebuilt/hello.elf) From f98e03c53149bbea4d64c35343a3aa722997b5d7 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 13 Apr 2022 12:23:17 +0200 Subject: [PATCH 2/2] update submodules to correct versions --- scc | 2 +- tgc-iss/dbt-rise-core | 2 +- tgc-iss/dbt-rise-tgc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scc b/scc index 1b3e1b3..93a5676 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 1b3e1b3efd50ce7114a20c8da9245a7ee1866876 +Subproject commit 93a5676fec9c1cb851b6a9cd4c462142de6dc144 diff --git a/tgc-iss/dbt-rise-core b/tgc-iss/dbt-rise-core index fd1a504..44acf8a 160000 --- a/tgc-iss/dbt-rise-core +++ b/tgc-iss/dbt-rise-core @@ -1 +1 @@ -Subproject commit fd1a504ac63b330f6214710e9259637c3e9ef524 +Subproject commit 44acf8a55936d5eedb5daf8cae0799ec1616413f diff --git a/tgc-iss/dbt-rise-tgc b/tgc-iss/dbt-rise-tgc index 09b01af..c054d75 160000 --- a/tgc-iss/dbt-rise-tgc +++ b/tgc-iss/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit 09b01af3fa117e07c665f29b77b3771547771ac2 +Subproject commit c054d75717dcefbc2048ab277fdfe1cb428640ef