From 816557dc725d9de4229a2aa4051f623f8163bd72 Mon Sep 17 00:00:00 2001 From: mat <26722564+matcool@users.noreply.github.com> Date: Tue, 30 Jan 2024 10:37:06 -0300 Subject: [PATCH] asdf --- .github/workflows/build.yml | 3 +-- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4301f66..cd97116 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: id: android-armv7 os: ubuntu-latest build_tests: false - extra_flags: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=$NDK_PATH/build/cmake/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-25" + extra_flags: "-DTULIP_DONT_BUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=$NDK_PATH/build/cmake/android.toolchain.cmake -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-25 -DANDROID_ARM_NEON=ON" out_paths: './build/src/libTulipHook.a' name: Build and Test ${{ matrix.config.name }} @@ -54,7 +54,6 @@ jobs: uses: nttld/setup-ndk@v1 with: ndk-version: r26b - # local-cache: true if: matrix.config.id == 'android-armv7' - name: Update ccache and Ninja diff --git a/CMakeLists.txt b/CMakeLists.txt index 8019705..290cc93 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ if(TULIP_LINK_SOURCE OR PROJECT_IS_TOP_LEVEL) add_subdirectory(src) endif() -if(PROJECT_IS_TOP_LEVEL) +if(PROJECT_IS_TOP_LEVEL AND NOT TULIP_DONT_BUILD_TESTS) add_subdirectory(test) endif()