forked from domob1812/namecoin-core
-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge bitcoin/bitcoin#29835: depends: build libevent with CMake
f59e905 depends: switch libevent to CMake (Cory Fields) Pull request description: Switches libevent in depends to be built with CMake. ACKs for top commit: TheCharlatan: ACK f59e905 willcl-ark: ACK f59e905 Tree-SHA512: 875bf9bc57653c78775a1f8192a2c964fea8f4490d733ff796d9efb00e786f0ca9a7c1a3fd610cda032273c4f2ae06394585b03567d5f241ab073c83a47cf927
- Loading branch information
Showing
2 changed files
with
43 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
cmake: set minimum version to 3.5 | ||
|
||
Fix generated pkg-config files, see | ||
https://github.com/libevent/libevent/pull/1165. | ||
|
||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -19,7 +19,7 @@ | ||
# start libevent.sln | ||
# | ||
|
||
-cmake_minimum_required(VERSION 3.1 FATAL_ERROR) | ||
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR) | ||
|
||
if (POLICY CMP0054) | ||
cmake_policy(SET CMP0054 NEW) | ||
diff --git a/cmake/AddEventLibrary.cmake b/cmake/AddEventLibrary.cmake | ||
index 04f5837e..d8ea42c4 100644 | ||
--- a/cmake/AddEventLibrary.cmake | ||
+++ b/cmake/AddEventLibrary.cmake | ||
@@ -20,12 +20,12 @@ macro(generate_pkgconfig LIB_NAME) | ||
|
||
set(LIBS "") | ||
foreach (LIB ${LIB_PLATFORM}) | ||
- set(LIBS "${LIBS} -L${LIB}") | ||
+ set(LIBS "${LIBS} -l${LIB}") | ||
endforeach() | ||
|
||
set(OPENSSL_LIBS "") | ||
foreach(LIB ${OPENSSL_LIBRARIES}) | ||
- set(OPENSSL_LIBS "${OPENSSL_LIBS} -L${LIB}") | ||
+ set(OPENSSL_LIBS "${OPENSSL_LIBS} -l${LIB}") | ||
endforeach() | ||
|
||
configure_file("lib${LIB_NAME}.pc.in" "lib${LIB_NAME}.pc" @ONLY) |