Merge pull request 'CMakeLists fixes' (#517) from mueller/cmake-fixes into development
Reviewed-on: fsfw/fsfw#517 LGTM
This commit is contained in:
commit
87a15910fe
@ -93,14 +93,6 @@ target_include_directories(${LIB_FSFW_NAME} INTERFACE
|
|||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
if(FSFW_BUILD_UNITTESTS)
|
|
||||||
configure_file(src/fsfw/FSFW.h.in fsfw/FSFW.h)
|
|
||||||
configure_file(src/fsfw/FSFWVersion.h.in fsfw/FSFWVersion.h)
|
|
||||||
else()
|
|
||||||
configure_file(src/fsfw/FSFW.h.in FSFW.h)
|
|
||||||
configure_file(src/fsfw/FSFWVersion.h.in FSFWVersion.h)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT CMAKE_CXX_STANDARD)
|
if(NOT CMAKE_CXX_STANDARD)
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
set(CMAKE_CXX_STANDARD_REQUIRED True)
|
||||||
@ -155,6 +147,14 @@ else()
|
|||||||
set(OS_FSFW "host")
|
set(OS_FSFW "host")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(FSFW_BUILD_UNITTESTS)
|
||||||
|
configure_file(src/fsfw/FSFW.h.in fsfw/FSFW.h)
|
||||||
|
configure_file(src/fsfw/FSFWVersion.h.in fsfw/FSFWVersion.h)
|
||||||
|
else()
|
||||||
|
configure_file(src/fsfw/FSFW.h.in FSFW.h)
|
||||||
|
configure_file(src/fsfw/FSFWVersion.h.in FSFWVersion.h)
|
||||||
|
endif()
|
||||||
|
|
||||||
message(STATUS "Compiling FSFW for the ${FSFW_OS_NAME} operating system.")
|
message(STATUS "Compiling FSFW for the ${FSFW_OS_NAME} operating system.")
|
||||||
|
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
@ -16,5 +16,3 @@ target_include_directories(${LIB_FSFW_NAME} PRIVATE
|
|||||||
target_include_directories(${LIB_FSFW_NAME} INTERFACE
|
target_include_directories(${LIB_FSFW_NAME} INTERFACE
|
||||||
${CMAKE_CURRENT_BINARY_DIR}
|
${CMAKE_CURRENT_BINARY_DIR}
|
||||||
)
|
)
|
||||||
|
|
||||||
configure_file(fsfw/FSFW.h.in fsfw/FSFW.h)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user