Explorar o código

cmake: fix SDL3-x.y.z.jar installation on Windows

Anonymous Maarten hai 1 ano
pai
achega
8bcfdb0c92
Modificáronse 1 ficheiros con 2 adicións e 1 borrados
  1. 2 1
      CMakeLists.txt

+ 2 - 1
CMakeLists.txt

@@ -3602,7 +3602,8 @@ if(NOT SDL_DISABLE_INSTALL)
     if(TARGET SDL3-jar)
     if(TARGET SDL3-jar)
       set(SDL_INSTALL_JAVADIR "${CMAKE_INSTALL_DATAROOTDIR}/java" CACHE PATH "Path where to install java clases + java sources")
       set(SDL_INSTALL_JAVADIR "${CMAKE_INSTALL_DATAROOTDIR}/java" CACHE PATH "Path where to install java clases + java sources")
       set(PROGUARD_RULES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/android-project/app/proguard-rules.pro")
       set(PROGUARD_RULES_PATH "${CMAKE_CURRENT_SOURCE_DIR}/android-project/app/proguard-rules.pro")
-      install(FILES $<TARGET_PROPERTY:SDL3-jar,INSTALL_FILES>
+      # install_jar or $<TARGET_PROPERTY:SDL3-jar,INSTALL_FILES> does not work on Windows: a SDL3.jar symlink is not generated
+      install(FILES "${CMAKE_CURRENT_BINARY_DIR}/SDL3-${SDL3_VERSION}.jar"
         DESTINATION "${SDL_INSTALL_JAVADIR}/SDL3")
         DESTINATION "${SDL_INSTALL_JAVADIR}/SDL3")
       install(FILES "${PROGUARD_RULES_PATH}" RENAME "proguard.txt"
       install(FILES "${PROGUARD_RULES_PATH}" RENAME "proguard.txt"
         DESTINATION "${SDL_INSTALL_JAVADIR}/SDL3")
         DESTINATION "${SDL_INSTALL_JAVADIR}/SDL3")