Permalink
Browse files

cmake: setting add_subdirectory for android makes building bundled li…

…bs on Android Studio thou but Android Studio entire toolchain is igonored and it compiles on system toolchain gcc/clang.

Need further investigation....
  • Loading branch information...
rafal1137 committed Dec 6, 2018
1 parent 62d1953 commit bfdd037e3d9a5870513a71b7429f60f95c91cbb5
Showing with 5 additions and 2 deletions.
  1. +5 −2 cmake/ETLBundledLibs.cmake
7 cmake/ETLBundledLibs.cmake 100644 → 100755
@@ -6,8 +6,11 @@
# or error out the build
if(EXISTS "${CMAKE_SOURCE_DIR}/libs/CMakeLists.txt")
message(STATUS "Using bundled libraries located at ${CMAKE_SOURCE_DIR}/libs")
#add_subdirectory(libs)
include(libs/CMakeLists.txt)
if(ANDROID)
add_subdirectory(libs)
else()
include(libs/CMakeLists.txt)
endif()
else()
message(STATUS "======================================================")
message(STATUS "Bundled libraries were not found on your system!")

0 comments on commit bfdd037

Please sign in to comment.