cmake.patch 2.7 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 5a5e87c..48db2d6 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -20,7 +20,7 @@ cmake_dependent_option(UVWASI_BUILD_TESTS
  6. set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/out)
  7. if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU")
  8. - list(APPEND uvwasi_cflags -fvisibility=hidden --std=gnu89)
  9. + list(APPEND uvwasi_cflags --std=gnu89)
  10. list(APPEND uvwasi_cflags -Wall -Wsign-compare -Wextra -Wstrict-prototypes)
  11. list(APPEND uvwasi_cflags -Wno-unused-parameter)
  12. endif()
  13. @@ -33,27 +33,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
  14. list(APPEND uvwasi_defines _GNU_SOURCE _POSIX_C_SOURCE=200112)
  15. endif()
  16. -find_package(LIBUV QUIET)
  17. -if(LIBUV_FOUND)
  18. - include_directories(${LIBUV_INCLUDE_DIR})
  19. -else()
  20. - include(FetchContent)
  21. - ## https://libuv.org
  22. - FetchContent_Declare(
  23. - libuv
  24. - GIT_REPOSITORY https://github.com/libuv/libuv.git
  25. - GIT_TAG ${LIBUV_VERSION})
  26. -
  27. - FetchContent_GetProperties(libuv)
  28. - if(NOT libuv_POPULATED)
  29. - FetchContent_Populate(libuv)
  30. - include_directories("${libuv_SOURCE_DIR}/include")
  31. - add_subdirectory(${libuv_SOURCE_DIR} ${libuv_BINARY_DIR} EXCLUDE_FROM_ALL)
  32. - endif()
  33. - set(LIBUV_INCLUDE_DIR ${libuv_SOURCE_DIR}/include)
  34. - set(LIBUV_LIBRARIES uv_a)
  35. -endif()
  36. -
  37. ## uvwasi source code files.
  38. set(uvwasi_sources
  39. src/clocks.c
  40. @@ -97,19 +76,7 @@ if(ASAN AND CMAKE_C_COMPILER_ID MATCHES "AppleClang|GNU|Clang")
  41. set (CMAKE_LINKER_FLAGS_DEBUG "${CMAKE_LINKER_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address")
  42. endif()
  43. -## Static library target.
  44. -add_library(uvwasi_a STATIC ${uvwasi_sources})
  45. -target_compile_definitions(uvwasi_a PRIVATE ${uvwasi_defines})
  46. -target_compile_options(uvwasi_a PRIVATE ${uvwasi_cflags})
  47. -target_include_directories(uvwasi_a PRIVATE ${PROJECT_SOURCE_DIR}/include)
  48. -if(CODE_COVERAGE)
  49. - target_link_libraries(uvwasi_a PUBLIC ${LIBUV_LIBRARIES} coverage_config)
  50. -else()
  51. - target_link_libraries(uvwasi_a PRIVATE ${LIBUV_LIBRARIES})
  52. -endif()
  53. -
  54. -## Shared library target.
  55. -add_library(uvwasi SHARED ${uvwasi_sources})
  56. +add_library(uvwasi ${uvwasi_sources})
  57. target_compile_definitions(uvwasi PRIVATE ${uvwasi_defines})
  58. target_compile_options(uvwasi PRIVATE ${uvwasi_cflags})
  59. target_include_directories(uvwasi PRIVATE ${PROJECT_SOURCE_DIR}/include)
  60. @@ -159,7 +126,7 @@ if(INSTALL_UVWASI AND NOT CODE_COVERAGE)
  61. configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/Config.cmake.in ${config_file} INSTALL_DESTINATION ${cmake_files_install_dir})
  62. install(
  63. - TARGETS uvwasi_a uvwasi
  64. + TARGETS uvwasi
  65. EXPORT ${target_export_name}
  66. RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
  67. ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}