Merge pull request #9 from Minres/develop

Develop
This commit is contained in:
Eyck Jentzsch 2022-04-17 09:25:53 +02:00 committed by GitHub
commit 3643bf9333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 14 deletions

View File

@ -84,10 +84,6 @@ find_package(elfio)
find_package(fmt) find_package(fmt)
find_package(gsl-lite) 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_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) find_package(Boost REQUIRED COMPONENTS program_options QUIET)
@ -127,16 +123,13 @@ endif()
if(NOT LIBS_ONLY) if(NOT LIBS_ONLY)
add_subdirectory(src) add_subdirectory(src)
endif() endif()
if(IS_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/plugins)
add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/plugins)
endif()
if(NOT NO_FW_BUILD) if(NOT NO_FW_BUILD)
add_custom_target(fw-hello-world ALL COMMAND make -C fw/hello-world add_custom_target(fw-hello-world ALL COMMAND make -C fw/hello-world
USES_TERMINAL WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) USES_TERMINAL WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
endif() endif()
# CTest is a testing tool that can be used to test your project. # CTest is a testing tool that can be used to test your project.
enable_testing() enable_testing()
add_test(NAME tgc-vp-hello-world add_test(NAME tgc-vp-hello-world
#WORKING_DIRECTORY ${ecosystem-vp_DIR}/bin #WORKING_DIRECTORY ${ecosystem-vp_DIR}/bin
COMMAND tgc-vp -f ${CMAKE_CURRENT_LIST_DIR}/fw/hello-world/prebuilt/hello.elf) COMMAND tgc-vp -f ${CMAKE_CURRENT_LIST_DIR}/fw/hello-world/prebuilt/hello.elf)

2
scc

@ -1 +1 @@
Subproject commit 1b3e1b3efd50ce7114a20c8da9245a7ee1866876 Subproject commit 93a5676fec9c1cb851b6a9cd4c462142de6dc144

@ -1 +1 @@
Subproject commit fd1a504ac63b330f6214710e9259637c3e9ef524 Subproject commit 44acf8a55936d5eedb5daf8cae0799ec1616413f

@ -1 +1 @@
Subproject commit 09b01af3fa117e07c665f29b77b3771547771ac2 Subproject commit c054d75717dcefbc2048ab277fdfe1cb428640ef