Skip to content
Snippets Groups Projects
Commit 597272b1 authored by Mederic Fourmy's avatar Mederic Fourmy
Browse files

Merge branch 'devel' into 22-adapt-to-core-cmakelists-txt-refactor

parents 245ef651 9fc748e6
No related branches found
No related tags found
2 merge requests!36After cmake and const refactor,!33Resolve "Adapt to core CMakeLists.txt refactor"
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 1
− 1
View file @ 597272b1
...@@ -101,7 +101,7 @@ stages: ...@@ -101,7 +101,7 @@ stages:
- cd $CI_PROJECT_DIR - cd $CI_PROJECT_DIR
- mkdir -pv build - mkdir -pv build
- cd build - cd build
- cmake -DCMAKE_BUILD_TYPE=release -DBUILD_TESTS=ON -DBUILD_DEMOS=ON .. - cmake -DCMAKE_BUILD_TYPE=release -DBUILD_TESTS=ON -DBUILD_DEMOS=OFF ..
- make -j$(nproc) - make -j$(nproc)
- ctest -j$(nproc) - ctest -j$(nproc)
- make install - make install
......
CMakeLists.txt
+ 0
− 9
View file @ 597272b1
...@@ -201,15 +201,6 @@ TARGET_LINK_LIBRARIES(${PLUGIN_NAME} ...@@ -201,15 +201,6 @@ TARGET_LINK_LIBRARIES(${PLUGIN_NAME}
opencv_video opencv_video
) )
# # TARGET_LINK_LIBRARIES(${PLUGIN_NAME} opencv)
# get_target_property(toto wolfcore INCLUDE_DIRECTORIES)
# message(WARNING ${toto})
# get_target_property(toto wolfcore INTERFACE_INCLUDE_DIRECTORIES)
# message(WARNING ${toto})
# get_target_property(toto wolfcore INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
# message(WARNING ${toto})
#Build demos #Build demos
#===============EXAMPLE========================= #===============EXAMPLE=========================
IF(BUILD_DEMOS) IF(BUILD_DEMOS)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment