Skip to content

Commit

Permalink
Merge pull request #103 from astamm/remove-anima-private
Browse files Browse the repository at this point in the history
Remove remaining traces of Anima Private
  • Loading branch information
Florent2305 authored Oct 5, 2023
2 parents 6197004 + 2218462 commit 9a055f1
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 52 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/build_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,8 @@ jobs:
- name: Install opengl
run: sudo apt-get -y install libgl1-mesa-dev

- name: webfactory/ssh-agent
uses: webfactory/[email protected]
with:
# Private SSH key to register in the SSH agent
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON -DUSE_ANIMA_PRIVATE:BOOL=ON -DUSE_GITHUB_SSH:BOOL=ON
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
8 changes: 1 addition & 7 deletions .github/workflows/build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,8 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: webfactory/ssh-agent
uses: webfactory/[email protected]
with:
# Private SSH key to register in the SSH agent
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON -DUSE_ANIMA_PRIVATE:BOOL=ON -DUSE_GITHUB_SSH:BOOL=ON
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
2 changes: 1 addition & 1 deletion .github/workflows/build_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
run: sudo apt-get -y install libgl1-mesa-dev

- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON -DUSE_ANIMA_PRIVATE:BOOL=OFF -DUSE_GITHUB_SSH:BOOL=OFF
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS:BOOL=OFF -DBUILD_ANIMA_TESTING:BOOL=ON

- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
7 changes: 0 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ option(USE_NLOPT "Build NLOPT dependencies" ON)
option(BUILD_ANIMA_TOOLS "Build ANIMA tools" ON)
option(BUILD_ANIMA_TESTING "Build ANIMA testing executables" OFF)
option(BUILD_ANIMA_DOCUMENTATION "Build ANIMA doxygen" OFF)
option(USE_ANIMA_PRIVATE "Use ANIMA private part, requires authorized access" OFF)

# Define default build type if needed
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
Expand Down Expand Up @@ -131,18 +130,12 @@ endif()

include(Anima)

if (USE_ANIMA_PRIVATE)
set(USE_GITHUB_SSH ON CACHE BOOL "Use by default Git SSH addresses, requires public key set on github" FORCE)
include(Anima_Private)
endif()

configure_file(${CMAKE_SOURCE_DIR}/superbuild/BinariesPackaging.cmake.in
${CMAKE_BINARY_DIR}/BinariesPackaging.cmake
@ONLY IMMEDIATE)

add_custom_target(pack-binaries
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/BinariesPackaging.cmake
DEPENDS Anima_Private
COMMENT "-- Generating binary packages"
)
29 changes: 0 additions & 29 deletions superbuild/Anima_Private.cmake

This file was deleted.

2 changes: 1 addition & 1 deletion superbuild/Boost.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set (proj Boost)

set (location "")
if (NOT DEFINED ${proj}_SRC_DIR)
set(location URL http://freefr.dl.sourceforge.net/project/boost/boost/1.74.0/boost_1_74_0.tar.gz)
set(location URL https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.tar.gz)
endif()

ExternalProject_Add(${proj}
Expand Down

0 comments on commit 9a055f1

Please sign in to comment.