fix-mingw.diff 1.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt
  2. index 073e07b..23213b0 100644
  3. --- a/src/loader/CMakeLists.txt
  4. +++ b/src/loader/CMakeLists.txt
  5. @@ -206,14 +206,14 @@ elseif(WIN32)
  6. openxr_loader PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/loader.rc"
  7. )
  8. - if(MSVC)
  9. - if(DYNAMIC_LOADER)
  10. - target_sources(
  11. - openxr_loader
  12. - PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/openxr-loader.def"
  13. - )
  14. - endif()
  15. + if(DYNAMIC_LOADER)
  16. + target_sources(
  17. + openxr_loader
  18. + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/openxr-loader.def"
  19. + )
  20. + endif()
  21. + if(MSVC)
  22. if(DYNAMIC_LOADER AND NOT (CMAKE_SYSTEM_NAME STREQUAL "WindowsStore"))
  23. # If building DLLs, force static CRT linkage
  24. set_target_properties(
  25. @@ -360,7 +360,7 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
  26. openxr_loader
  27. PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/openxr-loader.expsym"
  28. )
  29. - else()
  30. + elseif(NOT MINGW)
  31. set_target_properties(
  32. openxr_loader
  33. PROPERTIES
  34. @@ -402,7 +402,7 @@ export(
  35. # Create alias so that it can be used the same whether vendored as source or found with CMake.
  36. add_library(OpenXR::openxr_loader ALIAS openxr_loader)
  37. -if(WIN32 AND NOT INSTALL_TO_ARCHITECTURE_PREFIXES)
  38. +if(MSVC AND NOT INSTALL_TO_ARCHITECTURE_PREFIXES)
  39. set(TARGET_DESTINATION cmake)
  40. else()
  41. set(TARGET_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/openxr/)