From e720d73bb18dbca9c32d18e92b20a4c5b183d7cd Mon Sep 17 00:00:00 2001 From: visuve Date: Sun, 14 Apr 2024 07:54:17 +0300 Subject: [PATCH] Move icu dependency to PystykorvaLib - The CLI nor tests need it --- .github/workflows/ubuntu.yml | 6 +++--- CMakeLists.txt | 5 ----- PystykorvaLib/CMakeLists.txt | 5 +++++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index bba8456..7fc636c 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -25,9 +25,6 @@ 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 @@ -35,6 +32,9 @@ jobs: 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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5934abd..a678134 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") diff --git a/PystykorvaLib/CMakeLists.txt b/PystykorvaLib/CMakeLists.txt index ab1ac55..c93a798 100644 --- a/PystykorvaLib/CMakeLists.txt +++ b/PystykorvaLib/CMakeLists.txt @@ -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")