Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re enable ci #236

Open
wants to merge 1 commit into
base: cygnet-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CMake

on:
push:
branches: [ "main" ]
branches: [ "main", "cygnet-dev" ]
pull_request:
branches: [ "main" ]
branches: [ "main", "cygnet-dev" ]

env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
Expand Down
2 changes: 0 additions & 2 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"BUILD_SOPHUS_TESTS": "On",
"CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
"CMAKE_CXX_FLAGS": "-Werror -Wall -Wextra -Wpedantic -Wno-unused-local-typedef -Wno-unused-local-typedef -Wno-gnu-zero-variadic-macro-arguments -Wno-unused-parameter -Wno-unused-variable -Wno-vla-extension",
"CMAKE_CXX_EXTENSIONS": "OFF",
Expand Down Expand Up @@ -58,7 +57,6 @@
"displayName": "GCC RelWithDebInfo",
"inherits": "common",
"cacheVariables": {
"BUILD_SOPHUS_TESTS": "On",
"CMAKE_C_COMPILER": "gcc",
"CMAKE_CXX_COMPILER": "g++",
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
Expand Down
1 change: 0 additions & 1 deletion cmake/vcpkg/ports/default/farm-ng-core/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ set(VCPKG_CXX_FLAGS "-fconcepts ${VCPKG_CXX_FLAGS}")
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
"-DBUILD_SOPHUS_TESTS=Off"
"-DFARM_NG_PROVIDER_DEV_PACKAGES=Sophus"
"-DCMAKE_CXX_STANDARD=17" # TODO: Should be able to remove
"-DCMAKE_CXX_EXTENSIONS=On" # TODO: Should be able to remove
Expand Down
8 changes: 3 additions & 5 deletions cpp/sophus2/calculus/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ farm_ng_add_library(sophus2_calculus
)
target_link_libraries(sophus2_calculus INTERFACE sophus2_common)

if(${BUILD_SOPHUS_TESTS})
farm_ng_add_test(region
PARENT_LIBRARY sophus2_calculus
LABELS small)
endif()
farm_ng_add_test(region
PARENT_LIBRARY sophus2_calculus
LABELS small)
28 changes: 13 additions & 15 deletions cpp/sophus2/ceres/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@ farm_ng_add_library(sophus_ceres
)
target_link_libraries(sophus_ceres INTERFACE sophus2_lie)

if(${BUILD_SOPHUS_TESTS})
find_package(Ceres 2.1.0 REQUIRED)
foreach(test_basename
ceres
manifold
)
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus_ceres
LINK_LIBRARIES
Ceres::ceres sophus_ceres
farm_ng_core::farm_ng_core_pipeline
sophus2_sensor
LABELS large)
endforeach()
endif()
find_package(Ceres 2.1.0 REQUIRED)
foreach(test_basename
ceres
manifold
)
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus_ceres
LINK_LIBRARIES
Ceres::ceres sophus_ceres
farm_ng_core::farm_ng_core_pipeline
sophus2_sensor
LABELS large)
endforeach()
16 changes: 7 additions & 9 deletions cpp/sophus2/color/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ farm_ng_add_library(sophus2_color
)
target_link_libraries(sophus2_color PUBLIC sophus2_calculus)

if(${BUILD_SOPHUS_TESTS})
foreach(test_basename
color)
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_color
LINK_LIBRARIES sophus2_color
LABELS small)
endforeach()
endif()
foreach(test_basename
color)
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_color
LINK_LIBRARIES sophus2_color
LABELS small)
endforeach()
15 changes: 7 additions & 8 deletions cpp/sophus2/image/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ target_link_libraries(sophus2_image sophus2_geometry)



if(${BUILD_SOPHUS_TESTS})
foreach(test_basename ${sophus2_image_src_prefixes})
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_image
LINK_LIBRARIES sophus2_image
LABELS small)
endforeach()
endif()
foreach(test_basename ${sophus2_image_src_prefixes})
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_image
LINK_LIBRARIES sophus2_image
LABELS small)
endforeach()

14 changes: 6 additions & 8 deletions cpp/sophus2/linalg/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ farm_ng_add_library(sophus2_linalg

target_link_libraries(sophus2_linalg INTERFACE sophus2_common sophus_concept)

if(${BUILD_SOPHUS_TESTS})
foreach(test_basename ${sophus2_linalg_src_prefixes})
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_linalg
LINK_LIBRARIES sophus2_linalg
LABELS small)
endforeach()
endif()
foreach(test_basename ${sophus2_linalg_src_prefixes})
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_linalg
LINK_LIBRARIES sophus2_linalg
LABELS small)
endforeach()
14 changes: 6 additions & 8 deletions cpp/sophus2/sensor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,9 @@ SOURCES
target_link_libraries(sophus2_sensor sophus2_lie sophus2_image)


if(${BUILD_SOPHUS_TESTS})
foreach(test_basename ${sophus2_sensor_src_prefixes})
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_sensor
LINK_LIBRARIES sophus2_sensor
LABELS small)
endforeach()
endif()
foreach(test_basename ${sophus2_sensor_src_prefixes})
farm_ng_add_test(${test_basename}
PARENT_LIBRARY sophus2_sensor
LINK_LIBRARIES sophus2_sensor
LABELS small)
endforeach()
2 changes: 1 addition & 1 deletion scripts/compile_clang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set -e # exit on error

mkdir -p build
cd build
CC=clang CXX=clang++ cmake -G Ninja -DBUILD_FARM_NG_PROTOS=On -DBUILD_SOPHUS_TESTS=On ..
CC=clang CXX=clang++ cmake -G Ninja -DBUILD_FARM_NG_PROTOS=On ..
ninja
ninja test
2 changes: 1 addition & 1 deletion scripts/compile_clang_asan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set -e # exit on error

mkdir -p build
cd build
CC=clang CXX=clang++ cmake -G Ninja -DBUILD_ASAN=On -DCMAKE_BUILD_TYPE=Debug -DBUILD_FARM_NG_PROTOS=On -DBUILD_SOPHUS_TESTS=On ..
CC=clang CXX=clang++ cmake -G Ninja -DBUILD_ASAN=On -DCMAKE_BUILD_TYPE=Debug -DBUILD_FARM_NG_PROTOS=On ..
ninja
ninja test
2 changes: 1 addition & 1 deletion scripts/compile_gcc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ set -e # exit on error

mkdir -p build
cd build
cmake -DBUILD_FARM_NG_PROTOS=On -DBUILD_SOPHUS_TESTS=On ..
cmake -DBUILD_FARM_NG_PROTOS=On ..
make -j1
make test
Loading