early-access version 2853
This commit is contained in:
63
externals/vcpkg/ports/restbed/fix-cmake.patch
vendored
Executable file
63
externals/vcpkg/ports/restbed/fix-cmake.patch
vendored
Executable file
@@ -0,0 +1,63 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -57,7 +57,11 @@ find_package( asio REQUIRED )
|
||||
|
||||
if ( BUILD_SSL )
|
||||
add_definitions( "-DBUILD_SSL" )
|
||||
- find_package( openssl REQUIRED )
|
||||
+ find_package( OpenSSL REQUIRED )
|
||||
+ set( ssl_LIBRARY_SHARED OpenSSL::SSL )
|
||||
+ set( crypto_LIBRARY_SHARED OpenSSL::Crypto )
|
||||
+ set( ssl_LIBRARY_STATIC OpenSSL::SSL )
|
||||
+ set( crypto_LIBRARY_STATIC OpenSSL::Crypto )
|
||||
endif ( )
|
||||
|
||||
include_directories( ${INCLUDE_DIR} SYSTEM ${asio_INCLUDE} ${ssl_INCLUDE} )
|
||||
@@ -76,12 +76,13 @@ endif ( )
|
||||
#
|
||||
file( GLOB_RECURSE MANIFEST "${SOURCE_DIR}/*.cpp" )
|
||||
|
||||
+if ( NOT BUILD_SHARED_LIBS )
|
||||
set( STATIC_LIBRARY_NAME "${PROJECT_NAME}-static" )
|
||||
add_library( ${STATIC_LIBRARY_NAME} STATIC ${MANIFEST} )
|
||||
set_property( TARGET ${STATIC_LIBRARY_NAME} PROPERTY CXX_STANDARD 14 )
|
||||
set_property( TARGET ${STATIC_LIBRARY_NAME} PROPERTY CXX_STANDARD_REQUIRED ON )
|
||||
set_target_properties( ${STATIC_LIBRARY_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME} )
|
||||
-
|
||||
+else ( )
|
||||
set( SHARED_LIBRARY_NAME "${PROJECT_NAME}-shared" )
|
||||
add_library( ${SHARED_LIBRARY_NAME} SHARED ${MANIFEST} )
|
||||
set_property( TARGET ${SHARED_LIBRARY_NAME} PROPERTY CXX_STANDARD 14 )
|
||||
@@ -93,13 +94,20 @@ else ( )
|
||||
set_target_properties( ${SHARED_LIBRARY_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME} )
|
||||
endif ( )
|
||||
set_target_properties( ${SHARED_LIBRARY_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR} VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} )
|
||||
+endif ( )
|
||||
|
||||
if ( BUILD_SSL )
|
||||
+if ( BUILD_SHARED_LIBS )
|
||||
target_link_libraries( ${SHARED_LIBRARY_NAME} LINK_PRIVATE ${ssl_LIBRARY_SHARED} ${crypto_LIBRARY_SHARED} )
|
||||
+else ( )
|
||||
target_link_libraries( ${STATIC_LIBRARY_NAME} LINK_PRIVATE ${ssl_LIBRARY_STATIC} ${crypto_LIBRARY_STATIC} ${CMAKE_DL_LIBS} )
|
||||
+endif ( )
|
||||
else ( )
|
||||
+if ( BUILD_SHARED_LIBS )
|
||||
target_link_libraries( ${SHARED_LIBRARY_NAME} )
|
||||
+else ( )
|
||||
target_link_libraries( ${STATIC_LIBRARY_NAME} ${CMAKE_DL_LIBS} )
|
||||
+endif ( )
|
||||
endif ( )
|
||||
|
||||
if ( BUILD_TESTS )
|
||||
@@ -119,5 +127,8 @@ file( GLOB ARTIFACTS "${SOURCE_DIR}/*.hpp" )
|
||||
|
||||
install( FILES "${INCLUDE_DIR}/${PROJECT_NAME}" DESTINATION "${CMAKE_INSTALL_PREFIX}/include" )
|
||||
install( FILES ${ARTIFACTS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/corvusoft/${PROJECT_NAME}" )
|
||||
+if ( NOT BUILD_SHARED_LIBS )
|
||||
-install( TARGETS ${STATIC_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
|
||||
+install( TARGETS ${STATIC_LIBRARY_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
|
||||
+else ( )
|
||||
-install( TARGETS ${SHARED_LIBRARY_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
|
||||
+install( TARGETS ${SHARED_LIBRARY_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT library )
|
||||
+endif ( )
|
Reference in New Issue
Block a user