cmake: try to fix Android build with targets (#15)

* cmake: fix Android build with targets

Author: rilian-la-te

.github/workflows/github.yml

@@ -5,6 +5,7 @@ on:
       branches:
         - features/*
         - develop
+        - master
     pull_request:
     repository_dispatch:
 

.travis.yml

@@ -16,4 +16,4 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=true

project/gradle.properties

@@ -15,11 +15,12 @@ android {
 
 		externalNativeBuild {
 			cmake {
+				version "3.18+"
 				arguments "-DANDROID_STL=${VCMI_STL_VERSION}",
 					"-DANDROID_NATIVE_API_LEVEL=${VCMI_PLATFORM}",
 					"-DANDROID_TOOLCHAIN=clang",
 					"-DVCMI_ROOT=${PROJECT_PATH_BASE}"
-				cppFlags "-std=c++11", "-frtti", "-fexceptions", "-Wno-switch"
+				cppFlags "-frtti", "-fexceptions", "-Wno-switch"
 			}
 		}
 		ndk {

project/vcmi-app/build.gradle

@@ -10,6 +10,8 @@ set(VCMI_PATH_VCMI ${VCMI_ROOT}/ext/vcmi)
 set(VCMI_PATH_EXT_LIBS ${VCMI_ROOT}/ext-output/${ANDROID_ABI})
 
 find_library(syslib_z z)
+add_library(ZLIB::ZLIB UNKNOWN IMPORTED)
+set_target_properties(ZLIB::ZLIB PROPERTIES IMPORTED_LOCATION ${syslib_z})
 
 include_directories(${BOOST_ROOT})
 

project/vcmi-app/cmake-scripts/CMakeLists.txt

@@ -37,7 +37,7 @@ function(build_minizip)
 	set(minizippath ${VCMI_PATH_VCMI}/lib/minizip)
 	add_library(minizip SHARED ${minizippath}/zip.c ${minizippath}/unzip.c ${minizippath}/ioapi.c)
 	set_target_properties(minizip PROPERTIES LINKER_LANGUAGE C)
-	target_link_libraries(minizip ${syslib_z})
+	target_link_libraries(minizip ZLIB::ZLIB)
 endfunction(build_minizip)
 
 function(build_boost)

project/vcmi-app/cmake-scripts/ext-libs.cmake

@@ -8,9 +8,9 @@ function(prepend var prefix)
 	set(${var} "${listVar}" PARENT_SCOPE)
 endfunction(prepend)
 
-macro(import_lib name)
-	add_library(imp-${name} SHARED IMPORTED)
-	set_target_properties(imp-${name} PROPERTIES IMPORTED_LOCATION ${VCMI_PATH_EXT_LIBS}/lib${name}.so)
+macro(import_lib name alias)
+	add_library(${alias} SHARED IMPORTED)
+	set_target_properties(${alias} PROPERTIES IMPORTED_LOCATION ${VCMI_PATH_EXT_LIBS}/lib${name}.so)
 endmacro(import_lib)
 
 function(build_vcmi)
@@ -23,39 +23,36 @@ function(build_vcmi)
 		-DFL_CPP11)
 	add_definitions(-DBOOST_DISABLE_ASSERTS) # there's a problem in vcmi where mutexes can't be cleaned up correctly on exit (asserting on EBUSY result from pthread_mutex_destroy); I can't really debug it easily so just try to ignore it (we try to quit the app anyway)
 
-	import_lib(SDL2)
-	import_lib(SDL2_image)
-	import_lib(SDL2_mixer)
-	import_lib(SDL2_ttf)
-	import_lib(avcodec)
-	import_lib(avdevice)
-	import_lib(avfilter)
-	import_lib(avformat)
-	import_lib(avutil)
-	import_lib(smpeg2)
-	import_lib(postproc)
-	import_lib(swresample)
-	import_lib(swscale)
-	import_lib(x264)
-	import_lib(boost-system)
-	import_lib(boost-filesystem)
-	import_lib(boost-locale)
-	import_lib(boost-thread)
-	import_lib(boost-program-options)
-	import_lib(boost-datetime)
-	import_lib(minizip)
-	import_lib(vcmi-fuzzylite)
+	import_lib(SDL2 SDL2::SDL2)
+	import_lib(SDL2_image SDL2::Image)
+	import_lib(SDL2_mixer SDL2::Mixer)
+	import_lib(SDL2_ttf SDL2::TTF)
+	import_lib(avcodec ffmpeg::avcodec)
+	import_lib(avdevice ffmpeg::avdevice)
+	import_lib(avfilter ffmpeg::avfilter)
+	import_lib(avformat ffmpeg::avformat)
+	import_lib(avutil ffmpeg::avutil)
+	import_lib(smpeg2 smpeg2::smpeg2)
+	import_lib(postproc postproc::postproc)
+	import_lib(swresample ffmpeg::swresample)
+	import_lib(swscale ffmpeg::swscale)
+	import_lib(x264 x264::x264)
+	import_lib(boost-system Boost::system)
+	import_lib(boost-filesystem Boost::filesystem)
+	import_lib(boost-locale Boost::locale)
+	import_lib(boost-thread Boost::thread)
+	import_lib(boost-program-options Boost::program_options)
+	import_lib(boost-datetime Boost::date_time)
+	import_lib(minizip minizip::minizip)
+	import_lib(vcmi-fuzzylite fuzzylite::fuzzylite)
 
 	include(versions)
 
-	set(FFMPEG_LIBRARIES imp-avcodec imp-avdevice imp-avfilter imp-avformat imp-avutil imp-postproc imp-smpeg2 imp-swresample imp-swscale imp-x264)
-	set(SDL_LIBRARY imp-SDL2)
-	set(SDL_CLIENT_LIBRARIES imp-SDL2 imp-SDL2_image imp-SDL2_mixer imp-SDL2_ttf)
-	set(MINIZIP_LIBRARIES imp-minizip)
-	set(ZLIB_LIBRARIES ${syslib_z})
-	set(FL_LIBRARIES imp-vcmi-fuzzylite)
-	set(SYSTEM_LIBS ${SYSTEM_LIBS} ${syslib_log} ${syslib_z} ${FL_LIBRARIES})
-	set(Boost_LIBRARIES imp-boost-system imp-boost-filesystem imp-boost-datetime imp-boost-thread imp-boost-program-options imp-boost-locale)
+	add_library(Boost::boost INTERFACE IMPORTED)
+	set(FFMPEG_LIBRARIES ffmpeg::avcodec ffmpeg::avdevice ffmpeg::avfilter ffmpeg::avformat ffmpeg::avutil ffmpeg::swresample ffmpeg::swscale smpeg2::smpeg2 postproc::postproc x264::x264)
+	set(SDL_CLIENT_LIBRARIES SDL2::SDL2 SDL2::Image SDL2::Mixer SDL2::TTF)
+	set(SYSTEM_LIBS ${SYSTEM_LIBS} ${syslib_log} ZLIB::ZLIB fuzzylite::fuzzylite)
+	set(Boost_LIBRARIES Boost::system Boost::filesystem Boost::date_time Boost::thread Boost::program_options Boost::locale)
 
 	include(lib)
 	include(server)