Skip to content

Commit

Permalink
1
Browse files Browse the repository at this point in the history
  • Loading branch information
lackhole committed Jun 14, 2024
1 parent 66ab021 commit 3076ccc
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 15 deletions.
26 changes: 11 additions & 15 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ jobs:
working-directory: build
run: ctest --build-config ${{ matrix.build_type }}

ubuntu-android-ndk:
android-ndk:
runs-on: ${{ matrix.os }}

concurrency:
Expand Down Expand Up @@ -152,20 +152,16 @@ jobs:
- run: |
ls ${{ steps.setup-ndk.outputs.ndk-path }}
# - name: Configure CMake
# env:
# CC: ${{ matrix.cc_compiler }}-${{ matrix.compiler_version }}
# CXX: ${{ matrix.cxx_compiler }}-${{ matrix.compiler_version }}
# run: >
# cmake -B build
# -DCMAKE_CXX_COMPILER=${{ env.CXX }}
# -DCMAKE_C_COMPILER=${{ env.CC }}
# -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
# -DPREVIEW_TEST=ON
# -S ${{ github.workspace }}
#
# - name: Build
# run: cmake --build build --config ${{ matrix.build_type }}
- name: Configure CMake
run: >
cmake -B build
-DCMAKE_TOOLCHAIN_FILE=${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-DPREVIEW_TEST=ON
-S ${{ github.workspace }}
- name: Build
run: cmake --build build --config ${{ matrix.build_type }}
#
# - name: Test
# working-directory: build
Expand Down
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ option(PREVIEW_TEST "Build test" OFF)
add_library(preview INTERFACE)
target_include_directories(preview INTERFACE "${CMAKE_CURRENT_LIST_DIR}/include")

message("CMAKE_CXX_STANDARD: ${CMAKE_CXX_STANDARD}")
message("CMAKE_TOOLCHAIN_FILE: ${CMAKE_TOOLCHAIN_FILE}")

message("CMAKE_C_COMPILER: ${CMAKE_C_COMPILER}")
message("CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}")

if (MSVC)
target_compile_options(preview INTERFACE /Zc:__cplusplus)
target_compile_options(preview INTERFACE /Zc:ternary)
Expand Down

0 comments on commit 3076ccc

Please sign in to comment.