diff --git a/.github/workflows/linux-ci-jni.yml b/.github/workflows/linux-ci-jni.yml index a677be41e0b..42f465d8425 100644 --- a/.github/workflows/linux-ci-jni.yml +++ b/.github/workflows/linux-ci-jni.yml @@ -48,7 +48,7 @@ jobs: CXX: /usr/bin/clang++ - name: CMake (Java, Kotlin) run: | - cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DTW_UNITY_BUILD=ON -DTW_JAVA=ON -DTW_KOTLIN=ON -GNinja + cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DTW_UNITY_BUILD=ON -DTW_COMPILE_JAVA=ON -DTW_COMPILE_KOTLIN=ON -GNinja env: CC: /usr/bin/clang CXX: /usr/bin/clang++ diff --git a/CMakeLists.txt b/CMakeLists.txt index 204584c14ad..5cba2961f0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,10 +75,10 @@ if (${ANDROID}) set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/x86_64-linux-android/release/${WALLET_CORE_RS_LIB}) endif () target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf ${log-lib} Boost::boost) -elseif (${TW_JAVA}) +elseif (${TW_COMPILE_JAVA}) message("Configuring for JNI") file(GLOB_RECURSE core_sources src/*.c src/*.cc src/*.cpp src/*.h jni/cpp/*.cpp jni/cpp/*.h) - if (${KOTLIN}) + if (${TW_COMPILE_KOTLIN}) file(GLOB_RECURSE specific_sources jni/kotlin/*.h jni/kotlin/*.c diff --git a/cmake/StandardSettings.cmake b/cmake/StandardSettings.cmake index 2f3892ce9f7..bef5a651b52 100644 --- a/cmake/StandardSettings.cmake +++ b/cmake/StandardSettings.cmake @@ -66,7 +66,7 @@ endif () option(TW_UNIT_TESTS "Enable the unit tests of the project" ON) option(TW_BUILD_EXAMPLES "Enable the examples builds of the project" ON) -if (ANDROID OR IOS_PLATFORM OR TW_COMPILE_WASM OR TW_JAVA) +if (ANDROID OR IOS_PLATFORM OR TW_COMPILE_WASM OR TW_COMPILE_JAVA) set(TW_UNIT_TESTS OFF) set(TW_BUILD_EXAMPLES OFF) endif()