mirror of
https://github.com/zeromq/cppzmq.git
synced 2025-06-11 00:22:18 +02:00
Merge pull request #374 from gummif/patch-2
Problem: Invalid 32bit issues when using Conan
This commit is contained in:
commit
8d5c9a8898
@ -73,9 +73,18 @@ export(EXPORT ${PROJECT_NAME}-targets
|
|||||||
configure_package_config_file(${PROJECT_NAME}Config.cmake.in
|
configure_package_config_file(${PROJECT_NAME}Config.cmake.in
|
||||||
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
|
||||||
INSTALL_DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
|
INSTALL_DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
|
||||||
|
# Workaround until ARCH_INDEPENDENT flag can be used with cmake 3.14.
|
||||||
|
# The ConigVersion.cmake file contains checks for the architecture is was
|
||||||
|
# generated on, which can cause problems for header only libraries
|
||||||
|
# used with e.g. the Conan package manager. Since it is header only we
|
||||||
|
# can/should omit those checks.
|
||||||
|
set(CPPZMQ_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
|
||||||
|
set(CMAKE_SIZEOF_VOID_P "") # a simple unset is not sufficient
|
||||||
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
|
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
|
||||||
VERSION ${CPPZMQ_VERSION}
|
VERSION ${CPPZMQ_VERSION}
|
||||||
COMPATIBILITY AnyNewerVersion)
|
COMPATIBILITY AnyNewerVersion)
|
||||||
|
set(CMAKE_SIZEOF_VOID_P ${CPPZMQ_SIZEOF_VOID_P})
|
||||||
|
|
||||||
install(EXPORT ${PROJECT_NAME}-targets
|
install(EXPORT ${PROJECT_NAME}-targets
|
||||||
FILE ${PROJECT_NAME}Targets.cmake
|
FILE ${PROJECT_NAME}Targets.cmake
|
||||||
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
|
DESTINATION ${CPPZMQ_CMAKECONFIG_INSTALL_DIR})
|
||||||
|
Loading…
x
Reference in New Issue
Block a user