002-hacks-for-static-linking.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132
  1. --- a/runtime/CMakeLists.txt
  2. +++ b/runtime/CMakeLists.txt
  3. @@ -335,10 +335,6 @@
  4. set(LIBOMP_ENABLE_SHARED FALSE)
  5. endif()
  6. -if(WIN32 AND NOT LIBOMP_ENABLE_SHARED)
  7. - libomp_error_say("Static libraries requested but not available on Windows")
  8. -endif()
  9. -
  10. if(LIBOMP_USE_ITT_NOTIFY AND NOT LIBOMP_ENABLE_SHARED)
  11. message(STATUS "ITT Notify not supported for static libraries - forcing ITT Notify off")
  12. set(LIBOMP_USE_ITT_NOTIFY FALSE)
  13. --- a/runtime/src/CMakeLists.txt
  14. +++ b/runtime/src/CMakeLists.txt
  15. @@ -284,14 +284,14 @@
  16. set(LIBOMP_IMP_LIB_FILE ${LIBOMP_DEFAULT_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX})
  17. set(LIBOMP_GENERATED_IMP_LIB_FILENAME ${LIBOMP_DEFAULT_LIB_NAME}${LIBOMP_LIBRARY_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX})
  18. endif()
  19. - else()
  20. + elseif(LIBOMP_ENABLE_SHARED)
  21. set(LIBOMP_IMP_LIB_FILE ${LIBOMP_LIB_NAME}${CMAKE_IMPORT_LIBRARY_SUFFIX})
  22. set(LIBOMP_GENERATED_IMP_LIB_FILENAME ${LIBOMP_LIB_FILE}${CMAKE_STATIC_LIBRARY_SUFFIX})
  23. + set_target_properties(omp PROPERTIES ARCHIVE_OUTPUT_NAME ${LIBOMP_GENERATED_IMP_LIB_FILENAME})
  24. endif()
  25. set_target_properties(omp PROPERTIES
  26. VERSION ${LIBOMP_VERSION_MAJOR}.${LIBOMP_VERSION_MINOR} # uses /version flag
  27. IMPORT_PREFIX "" IMPORT_SUFFIX "" # control generated import library name when building omp
  28. - ARCHIVE_OUTPUT_NAME ${LIBOMP_GENERATED_IMP_LIB_FILENAME}
  29. )
  30. set(LIBOMP_IMP_LIB_TARGET omp)