-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate to new build structure (#25)
* remove `project` calls from LedBlinker deployment * add `project.cmake`, remove deployment `settings.ini` --------- Co-authored-by: Justine West <[email protected]>
- Loading branch information
Showing
4 changed files
with
12 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,18 @@ | ||
##### | ||
# 'LedBlinker' Deployment: | ||
# | ||
# This sets up the build for the 'LedBlinker' Application, including custom | ||
# components. In addition, it imports FPrime.cmake, which includes the core F Prime components. | ||
# This registers the 'LedBlinker' deployment to the build system. | ||
# Custom components that have not been added at the project-level should be added to | ||
# the list below. | ||
# | ||
##### | ||
|
||
### | ||
# Basic Project Setup | ||
# Topology and Components | ||
### | ||
cmake_minimum_required(VERSION 3.13) | ||
cmake_policy(SET CMP0048 NEW) | ||
project(LedBlinker VERSION 1.0.0 LANGUAGES C CXX) | ||
|
||
### | ||
# F' Core Setup | ||
# This includes all of the F prime core components, and imports the make-system. | ||
### | ||
include("${CMAKE_CURRENT_LIST_DIR}/../fprime/cmake/FPrime.cmake") | ||
# NOTE: register custom targets between these two lines | ||
include("${FPRIME_FRAMEWORK_PATH}/cmake/FPrime-Code.cmake") | ||
|
||
### | ||
# Components and Topology | ||
### | ||
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../Components") | ||
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Top") | ||
|
||
set(SOURCE_FILES "${CMAKE_CURRENT_LIST_DIR}/Main.cpp") | ||
set(MOD_DEPS ${PROJECT_NAME}/Top) | ||
set(MOD_DEPS ${FPRIME_CURRENT_MODULE}/Top) | ||
|
||
register_fprime_deployment() |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# This CMake file is intended to register project-wide objects. | ||
# This allows for reuse between deployments, or other projects. | ||
|
||
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/Components") | ||
add_fprime_subdirectory("${CMAKE_CURRENT_LIST_DIR}/LedBlinker/") |