Commit e95d2319 authored by Johan Mabille's avatar Johan Mabille

CPack option and .txt files installation dir

parent e80db0e8
...@@ -889,11 +889,7 @@ foreach (readme ${readme-docs}) ...@@ -889,11 +889,7 @@ foreach (readme ${readme-docs})
configure_file (${CMAKE_CURRENT_SOURCE_DIR}/${readme} ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/${readme} ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt)
if (NOT ZMQ_BUILD_FRAMEWORK) if (NOT ZMQ_BUILD_FRAMEWORK)
if (MSVC) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt DESTINATION share/zmq)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt DESTINATION .)
else ()
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${readme}.txt DESTINATION share/zmq)
endif ()
endif () endif ()
endforeach () endforeach ()
...@@ -903,8 +899,8 @@ if (WITH_DOC) ...@@ -903,8 +899,8 @@ if (WITH_DOC)
endif () endif ()
endif () endif ()
option(ENABLE_CPACK "Enables cpack rules" ON)
if (MSVC) if (MSVC AND ENABLE_CPACK)
include (InstallRequiredSystemLibraries) include (InstallRequiredSystemLibraries)
if (CMAKE_CL_64) if (CMAKE_CL_64)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment