diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
| commit | 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch) | |
| tree | 7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /ports/wangle/build.patch | |
| parent | 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff) | |
| parent | 9b21ff9612916e24f89c6839599d3d50446597d8 (diff) | |
| download | vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/wangle/build.patch')
| -rw-r--r-- | ports/wangle/build.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/ports/wangle/build.patch b/ports/wangle/build.patch new file mode 100644 index 000000000..fce998fed --- /dev/null +++ b/ports/wangle/build.patch @@ -0,0 +1,54 @@ +diff --git a/wangle/CMakeLists.txt b/wangle/CMakeLists.txt
+index 0302249..3bf1e6c 100644
+--- a/wangle/CMakeLists.txt
++++ b/wangle/CMakeLists.txt
+@@ -38,9 +38,9 @@ endif()
+
+ find_package(Boost REQUIRED COMPONENTS system thread filesystem regex context)
+ find_package(OpenSSL REQUIRED)
+-find_package(Glog REQUIRED)
+-find_package(Gflags REQUIRED)
+-find_package(Libevent REQUIRED)
++find_package(Glog CONFIG REQUIRED)
++find_package(Gflags CONFIG REQUIRED)
++find_package(Libevent CONFIG REQUIRED)
+ find_package(DoubleConversion REQUIRED)
+ find_package(Threads REQUIRED)
+ if (UNIX AND NOT APPLE)
+@@ -116,11 +116,9 @@ if (BUILD_SHARED_LIBS)
+ PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1)
+ endif()
+
+-target_include_directories(
+- wangle
+- PUBLIC
+- $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/..>
+- $<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>
++include_directories(
++ "${CMAKE_SOURCE_DIR}/.."
++ ${INCLUDE_INSTALL_DIR}
+ ${FOLLY_INCLUDE_DIR}
+ ${Boost_INCLUDE_DIR}
+ ${OPENSSL_INCLUDE_DIR}
+@@ -143,15 +141,19 @@ target_link_libraries(wangle PUBLIC
+ install(
+ TARGETS wangle
+ EXPORT wangle-exports
+- DESTINATION ${LIB_INSTALL_DIR}
++ RUNTIME DESTINATION bin
++ LIBRARY DESTINATION lib
++ ARCHIVE DESTINATION lib
+ )
+ # We unfortunately cannot install wangle's headers with the install()
+ # statement above. install(TARGETS) appears to only support installing
+ # PUBLIC_HEADER in a flat include directory, and not a deeper tree.
++if(NOT DISABLE_INSTALL_HEADERS)
+ foreach(dir ${WANGLE_HEADER_DIRS})
+- install(DIRECTORY ${dir} DESTINATION "${INCLUDE_INSTALL_DIR}/wangle"
++ install(DIRECTORY ${dir} DESTINATION "include/wangle"
+ FILES_MATCHING PATTERN "*.h")
+ endforeach()
++endif()
+
+ # Install CMake package configuration files for wangle
+ include(CMakePackageConfigHelpers)
|