From 0901700176283f35ce6c3ce9b587998779f33dfb Mon Sep 17 00:00:00 2001 From: Corentin Date: Mon, 21 Jun 2021 14:01:38 +0900 Subject: [PATCH] Fixed typo in CMakeLists.txt (ANDOID => ANDROID) --- CMakeLists.txt | 4 ++-- .../android/android-simple/app/build.gradle | 2 +- src/CMakeLists.txt | 22 +++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4df4c715..37162eb9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ option(KOMPUTE_OPT_INSTALL "Enable if you want to enable installation" 0) option(KOMPUTE_OPT_BUILD_PYTHON "Enable if you want to build python bindings" 0) option(KOMPUTE_OPT_ENABLE_SPDLOG "Extra compile flags for Kompute, see docs for full list" 0) option(KOMPUTE_OPT_REPO_SUBMODULE_BUILD "Use the submodule repos instead of external package manager" 0) -option(KOMPUTE_OPT_ANDOID_BUILD "Enable android compilation flags required" 0) +option(KOMPUTE_OPT_ANDROID_BUILD "Enable android compilation flags required" 0) option(KOMPUTE_OPT_DISABLE_VK_DEBUG_LAYERS "Explicitly disable debug layers even on debug" 0) option(KOMPUTE_OPT_DISABLE_SHADER_UTILS "Remove shader util code and dependencies including glslang" 0) option(KOMPUTE_OPT_DEPENDENCIES_SHARED_LIBS "Whether to use shared libraries for dependencies for install" 0) @@ -43,7 +43,7 @@ if(KOMPUTE_OPT_INSTALL) set(FMT_INSTALL ON CACHE BOOL "Enables install of fmt" FORCE) endif() -if(KOMPUTE_OPT_ANDOID_BUILD) +if(KOMPUTE_OPT_ANDROID_BUILD) set(KOMPUTE_EXTRA_CXX_FLAGS "${KOMPUTE_EXTRA_CXX_FLAGS} -DVK_USE_PLATFORM_ANDROID_KHR") endif() diff --git a/examples/android/android-simple/app/build.gradle b/examples/android/android-simple/app/build.gradle index 6ddb28577..146bb4163 100644 --- a/examples/android/android-simple/app/build.gradle +++ b/examples/android/android-simple/app/build.gradle @@ -17,7 +17,7 @@ android { abiFilters "armeabi-v7a", 'arm64-v8a', 'x86', 'x86_64' arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_static', - '-DKOMPUTE_OPT_ANDOID_BUILD=1', + '-DKOMPUTE_OPT_ANDROID_BUILD=1', '-DKOMPUTE_OPT_REPO_SUBMODULE_BUILD=1', '-DKOMPUTE_OPT_INSTALL=0', '-DKOMPUTE_OPT_ENABLE_SPDLOG=0', diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c1ab2d3eb..26bf47e66 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,17 +1,17 @@ -if(KOMPUTE_OPT_ANDOID_BUILD) +if(KOMPUTE_OPT_ANDROID_BUILD) find_library(android android) endif() # We don't import Vulkan library if Android build as its build dynamically -# Otherwise it is expected that the Vulkan SDK and dependencies are installed -if(NOT KOMPUTE_OPT_ANDOID_BUILD) +# Otherwise it is expected that the Vulkan SDK and dependencies are installed +if(NOT KOMPUTE_OPT_ANDROID_BUILD) find_package(Vulkan REQUIRED) endif() if(KOMPUTE_OPT_BUILD_SHADERS) # all shaders are compiled into cpp files - kompute_make(build_shaders + kompute_make(build_shaders OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include) endif() @@ -25,7 +25,7 @@ file(GLOB kompute_CPP "${CMAKE_CURRENT_SOURCE_DIR}/*.cpp" ) -if(KOMPUTE_OPT_ANDOID_BUILD) +if(KOMPUTE_OPT_ANDROID_BUILD) set(VK_ANDROID_COMMON_DIR ${ANDROID_NDK}/sources/third_party/vulkan/src/common) set(VK_ANDROID_PATCH_DIR ${PROJECT_SOURCE_DIR}/vk_ndk_wrapper_include/) set(VK_ANDROID_INCLUDE_DIR ${ANDROID_NDK}/sources/third_party/vulkan/src/include) @@ -57,14 +57,14 @@ target_include_directories( $ ) -if(NOT KOMPUTE_OPT_ANDOID_BUILD) +if(NOT KOMPUTE_OPT_ANDROID_BUILD) target_link_libraries( kompute Vulkan::Vulkan ) else() target_link_libraries( - kompute + kompute ) endif() @@ -89,7 +89,7 @@ else() endif() target_link_libraries( - kompute + kompute fmt::fmt ) @@ -105,7 +105,7 @@ if(KOMPUTE_OPT_ENABLE_SPDLOG) endif() target_link_libraries( - kompute + kompute spdlog::spdlog ) endif() @@ -114,9 +114,9 @@ endif() #################### Android ####################### ##################################################### -if(KOMPUTE_OPT_ANDOID_BUILD) +if(KOMPUTE_OPT_ANDROID_BUILD) target_link_libraries( - kompute + kompute kompute_vk_ndk_wrapper log android