Skip to content

Commit a02f802

Browse files
committed
cmake: Switch to libsecp256k1 upstream build system
1 parent f17c406 commit a02f802

File tree

4 files changed

+12
-64
lines changed

4 files changed

+12
-64
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,6 @@ include(cmake/introspection.cmake)
357357
include(cmake/crc32c.cmake)
358358
include(cmake/leveldb.cmake)
359359
include(cmake/minisketch.cmake)
360-
include(cmake/secp256k1.cmake)
361360

362361
include(ProcessConfigurations)
363362
are_flags_overridden(CMAKE_CXX_FLAGS cxx_flags_overridden)
@@ -633,8 +632,6 @@ else()
633632
endif()
634633
message("Cross compiling ....................... ${cross_status}")
635634
message("Preprocessor defined macros ........... ${definitions}")
636-
message("C compiler ............................ ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION}, ${CMAKE_C_COMPILER}")
637-
message("CFLAGS ................................ ${CMAKE_C_FLAGS}")
638635
message("C++ compiler .......................... ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}, ${CMAKE_CXX_COMPILER}")
639636
message("CXXFLAGS .............................. ${CMAKE_CXX_FLAGS}")
640637
get_target_interface(common_compile_options core_interface COMPILE_OPTIONS)

cmake/module/ProcessConfigurations.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ function(print_config_flags)
144144
macro(print_flags config)
145145
string(TOUPPER "${config}" config_uppercase)
146146
message(" - Preprocessor defined macros ........ ${definitions_${config_uppercase}}")
147-
message(" - CFLAGS ............................. ${CMAKE_C_FLAGS_${config_uppercase}}")
148147
message(" - CXXFLAGS ........................... ${CMAKE_CXX_FLAGS_${config_uppercase}}")
149148
message(" - LDFLAGS for executables ............ ${CMAKE_EXE_LINKER_FLAGS_${config_uppercase}}")
150149
message(" - LDFLAGS for shared libraries ....... ${CMAKE_SHARED_LINKER_FLAGS_${config_uppercase}}")

cmake/secp256k1.cmake

Lines changed: 0 additions & 58 deletions
This file was deleted.

src/CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
1-
# Copyright (c) 2023 The Bitcoin Core developers
1+
# Copyright (c) 2024-present The Bitcoin Core developers
22
# Distributed under the MIT software license, see the accompanying
3-
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
3+
# file COPYING or https://opensource.org/license/mit/.
44

55
include(GNUInstallDirs)
66
include(AddWindowsResources)
77

8+
option(SECP256K1_DISABLE_SHARED "" ON)
9+
option(SECP256K1_ENABLE_MODULE_ECDH "" OFF)
10+
option(SECP256K1_ENABLE_MODULE_RECOVERY "" ON)
11+
option(SECP256K1_BUILD_BENCHMARK "" OFF)
12+
option(SECP256K1_BUILD_TESTS "" OFF)
13+
option(SECP256K1_BUILD_EXHAUSTIVE_TESTS "" OFF)
14+
option(SECP256K1_BUILD_CTIME_TESTS "" OFF)
15+
add_subdirectory(secp256k1)
16+
target_link_libraries(secp256k1 PRIVATE core_base_interface)
17+
818
configure_file(${CMAKE_SOURCE_DIR}/cmake/bitcoin-config.h.in config/bitcoin-config.h @ONLY)
919
add_compile_definitions(HAVE_CONFIG_H)
1020
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

0 commit comments

Comments
 (0)