Skip to content

Commit

Permalink
Replace NamedType with strong_type (#61)
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrickKa authored Jul 5, 2024
2 parents 549e807 + e432d01 commit 4d39d63
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 27 deletions.
41 changes: 16 additions & 25 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,6 @@ else
fi
cd ..

if [[ $1 == "linux" ]]; then
cd Catch2
cmake --toolchain ../linux-x86.cmake -S . -B build -DBUILD_TESTING=OFF
sudo cmake --build build/ --target install
cd ..
fi

cd etl
cmake -S . -B build
if [[ $1 == "linux" ]]; then
Expand All @@ -64,23 +57,12 @@ else
fi
cd ..

cd debug_assert
cmake -S . -B build
if [[ $1 == "linux" ]]; then
sudo cmake --install build
else
sudo cmake --install build --prefix "$2"
fi
cd ..

cd NamedType
cmake -S . -B build
if [[ $1 == "linux" ]]; then
sudo cmake --install build
else
sudo cmake --install build --prefix "$2"
cd Catch2
cmake --toolchain ../linux-x86.cmake -S . -B build -DBUILD_TESTING=OFF
sudo cmake --build build/ --target install
cd ..
fi
cd ..

cd littlefs
if [[ $1 == "linux" ]]; then
Expand All @@ -94,6 +76,15 @@ else
fi
cd ..

cd strong_type
cmake -S . -B build
if [[ $1 == "linux" ]]; then
sudo cmake --install build
else
sudo cmake --install build --prefix "$2"
fi
cd ..

if [[ $1 == "linux" ]]; then
cd include-what-you-use
cmake -S . -B build -G "Ninja" -DCMAKE_PREFIX_PATH=/usr/lib/llvm-15
Expand All @@ -106,9 +97,9 @@ fi
if [ "$DOCKER_BUILD" = true ]; then
echo "Removing repositories"
rm -r rodos
rm -r etl
rm -r Catch2
rm -r littlefs
rm -r etl
rm -r debug_assert
rm -r type_safe
rm -r strong_type
rm -r include-what-you-use
fi
3 changes: 1 addition & 2 deletions libraries.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
rodos,0dd30adb373972b9adf2a4a4eb0b068130f45f53,https://github.com/SpaceTeam/rodos.git
etl,cceb5038664a4fa363e79709bc08bd0bb356ae50,https://github.com/ETLCPP/etl.git
debug_assert,c0b325e9023cc021bce0d23c8b4211f8e5b071d0,https://github.com/foonathan/debug_assert.git
Catch2,v3.1.0,https://github.com/catchorg/Catch2.git
littlefs,8e53bfeda7716ed7056a2b519bba45f40dea7df0,https://github.com/SpaceTeam/littlefs.git
NamedType,9461f8d26238e14ba3c41813cf8e8fe9a0c3c75e,https://github.com/SpaceTeam/NamedType.git
strong_type,v14,https://github.com/rollbear/strong_type
include-what-you-use,0.19,https://github.com/include-what-you-use/include-what-you-use.git

0 comments on commit 4d39d63

Please sign in to comment.