Skip to content
Snippets Groups Projects
Commit 00e7ad16 authored by Joan Solà Ortega's avatar Joan Solà Ortega
Browse files

Merge branch 'devel' into 13-migrate-to-state-composites

parents 96ba0272 26fbdcfe
No related branches found
No related tags found
3 merge requests!28release after RAL,!27After 2nd RAL submission,!15Resolve "Migrate to state composites"
...@@ -236,16 +236,6 @@ SET(SRCS_YAML ...@@ -236,16 +236,6 @@ SET(SRCS_YAML
# ENDIF(Ceres_FOUND) # ENDIF(Ceres_FOUND)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
message(STATUS "Using C++ compiler clang")
target_compile_options(${PROJECT_NAME} PRIVATE -Winconsistent-missing-override)
# using Clang
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
message(STATUS "Using C++ compiler gnu")
target_compile_options(${PROJECT_NAME} PRIVATE -Wsuggest-override)
# using GCC
endif()
# create the shared library # create the shared library
ADD_LIBRARY(${PLUGIN_NAME} ADD_LIBRARY(${PLUGIN_NAME}
SHARED SHARED
...@@ -265,6 +255,19 @@ ADD_LIBRARY(${PLUGIN_NAME} ...@@ -265,6 +255,19 @@ ADD_LIBRARY(${PLUGIN_NAME}
${SRCS_YAML} ${SRCS_YAML}
) )
# Set compiler options
# ====================
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
message(STATUS "Using C++ compiler clang")
target_compile_options(${PLUGIN_NAME} PRIVATE -Winconsistent-missing-override)
# using Clang
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
message(STATUS "Using C++ compiler gnu")
target_compile_options(${PLUGIN_NAME} PRIVATE -Wsuggest-override)
# using GCC
endif()
#Link the created libraries #Link the created libraries
#===============EXAMPLE========================= #===============EXAMPLE=========================
TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolf_LIBRARIES}) TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ${wolf_LIBRARIES})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment