Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ Makefile.in
.libs
*.la
*.lo
/aclocal.m4
/autom4te.cache
/build-aux
/config.*
/configure
/libtool
.dirstamp
builds/gnu/aclocal.m4
builds/gnu/autom4te.cache
builds/gnu/build-aux
builds/gnu/config.*
builds/gnu/configure
builds/gnu/libtool
builds/gnu/.dirstamp

# pkg-config pc file from .pc.in
*.pc
builds/gnu/*.pc

# msbuild/msvc
/.vs
Expand Down
200 changes: 0 additions & 200 deletions Makefile.am

This file was deleted.

14 changes: 4 additions & 10 deletions builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,11 @@ endif()
#------------------------------------------------------------------------------
# Project options.
#------------------------------------------------------------------------------
option( with-tests "Build tests." ON )
option( with-tests "Compile with unit tests." ON )

#------------------------------------------------------------------------------
# Dependencies.
#------------------------------------------------------------------------------

if ( BUILD_SHARED_LIBS )
set( libbitcoin-database_USE_STATIC_LIBS "OFF" )
set( libbitcoin-network_USE_STATIC_LIBS "OFF" )
Expand All @@ -99,7 +98,6 @@ find_package( Boost 1.86.0 REQUIRED
#------------------------------------------------------------------------------
# Compiler options.
#------------------------------------------------------------------------------

include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles)
Expand Down Expand Up @@ -171,13 +169,8 @@ endif()
#------------------------------------------------------------------------------
# Linker options.
#------------------------------------------------------------------------------

include(CheckLinkerFlag)

#------------------------------------------------------------------------------
# Configurable file(s).
#------------------------------------------------------------------------------

#------------------------------------------------------------------------------
# libbitcoin-node library
#------------------------------------------------------------------------------
Expand All @@ -199,7 +192,7 @@ target_compile_options( libbitcoin-node
$<$<COMPILE_LANGUAGE:CXX>:-Wno-comment>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-copy>
$<$<CXX_COMPILER_ID:Clang>:-Wno-mismatched-tags>
-fstack-protector-all
$<$<COMPILE_LANGUAGE:CXX>:-fstack-protector-all>
)

file( GLOB_RECURSE libbitcoin_node_HEADERS CONFIGURE_DEPENDS
Expand Down Expand Up @@ -279,7 +272,7 @@ if ( with-tests )
$<$<CXX_COMPILER_ID:Clang>:-Wno-mismatched-tags>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-long-long>
$<$<CXX_COMPILER_ID:GNU>:-fno-var-tracking-assignments>
-fstack-protector-all
$<$<COMPILE_LANGUAGE:CXX>:-fstack-protector-all>
)

file( GLOB_RECURSE libbitcoin_node_test_SOURCES CONFIGURE_DEPENDS
Expand All @@ -304,6 +297,7 @@ if ( with-tests )
SOVERSION ${PROJECT_VERSION_MAJOR}
)
endif()

#------------------------------------------------------------------------------
# Installation routine.
#------------------------------------------------------------------------------
Expand Down
Loading
Loading