Fix target name on Android

theCheeseboard · Mar 18, 2024 · be7cb4e · be7cb4e
1 parent b20bac3
commit be7cb4e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/cmake-scripts/cntp-init.cmake b/lib/cmake-scripts/cntp-init.cmake
@@ -72,6 +72,12 @@ function(cntp_init_android target)
     file(GLOB_RECURSE ANDROID_SKEL_FILES ${ORIGINAL_PACKAGE_SOURCE_DIR}/*)
     foreach(file ${ANDROID_SKEL_FILES})
         cmake_path(RELATIVE_PATH file BASE_DIRECTORY ${ORIGINAL_PACKAGE_SOURCE_DIR} OUTPUT_VARIABLE relFile)
+        cmake_path(GET relFile FILENAME filename)
+
+        if(${filename} STREQUAL "icon.png")
+            continue()
+        endif()
+
         set(destination ${ANDROID_FILES_DESTINATION}/${relFile})
         configure_file(${file} ${destination} COPYONLY)
     endforeach()

diff --git a/lib/cmake-scripts/cntp-targetname.cmake b/lib/cmake-scripts/cntp-targetname.cmake
@@ -19,9 +19,11 @@ function(cntp_target_name targetName targetReadableName)
         ENDIF()
     ENDIF()
 
-
-    set_target_properties(${targetName} PROPERTIES
-            OUTPUT_NAME "${TARGET_FINAL_NAME}")
+    if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android")
+        # Changing the target name when building for Android confuses Qt Creator
+        set_target_properties(${targetName} PROPERTIES
+                OUTPUT_NAME "${TARGET_FINAL_NAME}")
+    endif()
     target_compile_definitions(${targetName} PRIVATE
             T_APPMETA_READABLE_NAME="${TARGET_READABLE_NAME}")
 endfunction()