Skip to content

Commit

Permalink
Move icu dependency to PystykorvaLib
Browse files Browse the repository at this point in the history
- The CLI nor tests need it
  • Loading branch information
visuve committed Apr 14, 2024
1 parent 6926b2e commit e720d73
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ jobs:
cmake -G Ninja -DCMAKE_C_COMPILER=/usr/bin/gcc-12 -DCMAKE_CXX_COMPILER=/usr/bin/g++-12 ../..
ninja
- name: Test GCC
run: valgrind --leak-check=yes ./out/gcc/pystykorva_tests

- name: Build Clang
run: |
mkdir -p out/clang
cd out/clang
cmake -G -DCMAKE_C_COMPILER=/usr/bin/clang-15 -DCMAKE_CXX_COMPILER=/usr/bin/clang++-15 ../..
ninja
- name: Test GCC
run: valgrind --leak-check=yes ./out/gcc/pystykorva_tests

- name: Test Clang
run: valgrind --leak-check=yes ./out/clang/pystykorva_tests

5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ if(MSVC)
add_compile_options(/MP /W4 /WX)
endif()

# apt install libicu-dev / dnf install icu
find_package(ICU COMPONENTS i18n uc REQUIRED)

message(${ICU_INCLUDE_DIR})

add_subdirectory("PystykorvaLib")
include_directories("PystykorvaLib")

Expand Down
5 changes: 5 additions & 0 deletions PystykorvaLib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# apt install libicu-dev / dnf install icu
find_package(ICU COMPONENTS i18n uc REQUIRED)

message(${ICU_INCLUDE_DIR})

file(GLOB SourceFiles "*.cpp")

if(CMAKE_SYSTEM_NAME MATCHES "Windows")
Expand Down

0 comments on commit e720d73

Please sign in to comment.