cmake.patch 1.5 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index 6d3c761..0689164 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -48,7 +48,7 @@ if(MSVC)
  6. endif()
  7. # Generate header file for build
  8. -if(WIN32)
  9. +if(WIN32 AND BUILD_SHARED_LIBS)
  10. set(DLL_VARIABLE "__declspec(dllexport)")
  11. elseif(HAVE_VISIBILITY)
  12. set(DLL_VARIABLE "__attribute__((__visibility__(\"default\")))")
  13. @@ -59,7 +59,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/include/cppp/reiconv.hpp.in" "${outp
  14. configure_file("${CMAKE_CURRENT_SOURCE_DIR}/windows/libcppp-reiconv.rc.in" "${CMAKE_BINARY_DIR}/windows/libcppp-reiconv.rc")
  15. # Generate header file for install
  16. -if(WIN32)
  17. +if(WIN32 AND BUILD_SHARED_LIBS)
  18. set(DLL_VARIABLE "__declspec(dllimport)")
  19. else()
  20. set(DLL_VARIABLE "")
  21. @@ -83,7 +83,7 @@ cppp_build_library(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/lib/iconv.cpp" T
  22. # Include test suite.
  23. include("tests/tests.cmake")
  24. -
  25. +if (NOT BUILD_SHARED_LIBS)
  26. # Install
  27. # Static
  28. # PERMISSIONS 0644
  29. @@ -94,7 +94,7 @@ install(TARGETS libcppp-reiconv.static
  30. ARCHIVE DESTINATION "${install_staticdir}"
  31. RUNTIME DESTINATION "${install_bindir}"
  32. INCLUDES DESTINATION "${install_includedir}" )
  33. -
  34. +else()
  35. # Shared
  36. # PERMISSIONS 0755
  37. install(TARGETS libcppp-reiconv.shared
  38. @@ -105,7 +105,7 @@ install(TARGETS libcppp-reiconv.shared
  39. ARCHIVE DESTINATION "${install_staticdir}"
  40. RUNTIME DESTINATION "${install_bindir}"
  41. INCLUDES DESTINATION "${install_includedir}" )
  42. -
  43. +endif()
  44. # Includes
  45. # install includes
  46. # PERMISSIONS 0644