cmake.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 33e0fa1..6303c74 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -24,10 +24,7 @@ SET(zlog_so_ver ${CPACK_PACKAGE_VERSION_MAJOR})
  6. message(STATUS "plateform : ${CMAKE_SYSTEM}")
  7. -add_definitions("-g -Wall -Wstrict-prototypes")
  8. -set(CMAKE_C_FLAGS "-std=c99 -pedantic -D_DEFAULT_SOURCE")
  9. -set(CMAKE_C_FLAGS_DEBUG "-ggdb3 -DDEBUG")
  10. -set(CMAKE_C_FLAGS_RELEASE "-O2")
  11. +
  12. if (WIN32)
  13. set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 ")
  14. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
  15. index 2471e3a..4c58f96 100644
  16. --- a/src/CMakeLists.txt
  17. +++ b/src/CMakeLists.txt
  18. @@ -10,7 +10,6 @@ endif()
  19. list(REMOVE_ITEM SRCS ./zlog-chk-conf.c)
  20. add_library(zlog
  21. - SHARED
  22. ${SRCS}
  23. )
  24. target_link_libraries(zlog
  25. @@ -26,23 +25,6 @@ endif()
  26. set_target_properties(zlog PROPERTIES VERSION ${zlog_ver} SOVERSION ${zlog_so_ver})
  27. -add_library(zlog_s
  28. - STATIC
  29. - ${SRCS}
  30. - )
  31. -target_link_libraries(zlog_s
  32. - ${CMAKE_THREAD_PREFER_PTHREAD}
  33. - )
  34. -
  35. -if (WIN32)
  36. - target_link_libraries(zlog_s
  37. - ${UNIXEM_LIBRARY}
  38. - Ws2_32
  39. - )
  40. -endif()
  41. -
  42. -set_target_properties(zlog_s PROPERTIES OUTPUT_NAME zlog)
  43. -
  44. #================================================================
  45. # generate zlog-chk-conf
  46. #================================================================
  47. @@ -53,7 +35,7 @@ target_link_libraries(zlog-chk-conf zlog)
  48. # install
  49. #================================================================
  50. install(TARGETS
  51. - zlog zlog_s zlog-chk-conf
  52. + zlog zlog-chk-conf
  53. COMPONENT zlog
  54. ARCHIVE DESTINATION lib
  55. LIBRARY DESTINATION lib