Skip to content

Commit 9ffa878

Browse files
committed
Curl included for win build
1 parent e392b3a commit 9ffa878

15 files changed

+87
-20839
lines changed

CMakeLists.txt

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
# Defines LocalCoin library target.
2-
project( LocalCoin )
1+
# Defines BitShares library target.
2+
project( BitShares )
33
cmake_minimum_required( VERSION 2.8.12 )
44

5-
set( BLOCKCHAIN_NAME "LocalCoin" )
5+
set( BLOCKCHAIN_NAME "BitShares" )
66

77
set( CLI_CLIENT_EXECUTABLE_NAME graphene_client )
8-
set( GUI_CLIENT_EXECUTABLE_NAME LocalCoin )
8+
set( GUI_CLIENT_EXECUTABLE_NAME BitShares )
99
set( CUSTOM_URL_SCHEME "gcs" )
1010
set( INSTALLER_APP_ID "68ad7005-8eee-49c9-95ce-9eed97e5b347" )
1111

@@ -32,6 +32,8 @@ if (USE_PCH)
3232
include (cotire)
3333
endif(USE_PCH)
3434

35+
option(USE_PROFILER "Build with GPROF support(Linux)." OFF)
36+
3537
IF( NOT WIN32 )
3638
list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/libraries/fc/CMakeModules" )
3739
ENDIF( NOT WIN32 )
@@ -41,17 +43,14 @@ get_git_head_revision( GIT_REFSPEC GIT_SHA2 )
4143

4244
SET(BOOST_COMPONENTS)
4345
LIST(APPEND BOOST_COMPONENTS thread
44-
iostreams
45-
date_time
46-
system
47-
filesystem
48-
program_options
49-
signals
50-
serialization
51-
chrono
52-
unit_test_framework
53-
context
54-
locale)
46+
iostreams
47+
date_time
48+
system
49+
filesystem
50+
program_options
51+
chrono
52+
unit_test_framework
53+
context)
5554
SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
5655

5756
IF( WIN32 )
@@ -63,15 +62,15 @@ ENDIF(WIN32)
6362
FIND_PACKAGE(Boost 1.57 REQUIRED COMPONENTS ${BOOST_COMPONENTS})
6463
# For Boost 1.53 on windows, coroutine was not in BOOST_LIBRARYDIR and do not need it to build, but if boost versin >= 1.54, find coroutine otherwise will cause link errors
6564
IF(NOT "${Boost_VERSION}" MATCHES "1.53(.*)")
66-
SET(BOOST_LIBRARIES_TEMP ${Boost_LIBRARIES})
67-
FIND_PACKAGE(Boost 1.54 REQUIRED COMPONENTS coroutine)
68-
LIST(APPEND BOOST_COMPONENTS coroutine)
69-
SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
65+
SET(BOOST_LIBRARIES_TEMP ${Boost_LIBRARIES})
66+
FIND_PACKAGE(Boost 1.54 REQUIRED COMPONENTS coroutine)
67+
LIST(APPEND BOOST_COMPONENTS coroutine)
68+
SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
7069
ENDIF()
7170

7271
if( WIN32 )
7372

74-
message( STATUS "Configuring LocalCoin on WIN32")
73+
message( STATUS "Configuring BitShares on WIN32")
7574
set( DB_VERSION 60 )
7675
set( BDB_STATIC_LIBS 1 )
7776

@@ -81,14 +80,14 @@ if( WIN32 )
8180
set(CRYPTO_LIB)
8281

8382
if( MSVC )
84-
#looks like this flag can have different default on some machines.
85-
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
86-
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
87-
88-
# Probably cmake has a bug and vcxproj generated for executable in Debug conf. has disabled debug info
89-
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")
83+
#looks like this flag can have different default on some machines.
84+
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SAFESEH:NO")
85+
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
9086

87+
# Probably cmake has a bug and vcxproj generated for executable in Debug conf. has disabled debug info
88+
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /DEBUG")
9189
endif ( MSVC )
90+
9291
# On windows tcl should be installed to the directory pointed by setenv.bat script
9392
SET(TCL_INCLUDE_PATH $ENV{TCL_ROOT}/include)
9493
MESSAGE(STATUS "tcl INCLUDE PATH: ${TCL_INCLUDE_PATH}")
@@ -108,12 +107,15 @@ else( WIN32 ) # Apple AND Linux
108107

109108
if( APPLE )
110109
# Apple Specific Options Here
111-
message( STATUS "Configuring LocalCoin on OS X" )
110+
message( STATUS "Configuring BitShares on OS X" )
112111
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -stdlib=libc++ -Wall" )
113112
else( APPLE )
114113
# Linux Specific Options Here
115-
message( STATUS "Configuring LocalCoin on Linux" )
114+
message( STATUS "Configuring BitShares on Linux" )
116115
set( CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -std=c++11 -Wall" )
116+
if(USE_PROFILER)
117+
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg" )
118+
endif( USE_PROFILER )
117119
set( rt_library rt )
118120
set( pthread_library pthread)
119121
if ( NOT DEFINED crypto_library )
@@ -146,7 +148,7 @@ else( WIN32 ) # Apple AND Linux
146148

147149
endif( WIN32 )
148150

149-
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build LocalCoin for code coverage analysis")
151+
set(ENABLE_COVERAGE_TESTING FALSE CACHE BOOL "Build BitShares for code coverage analysis")
150152

151153
if(ENABLE_COVERAGE_TESTING)
152154
SET(CMAKE_CXX_FLAGS "--coverage ${CMAKE_CXX_FLAGS}")
@@ -176,18 +178,18 @@ set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
176178
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
177179
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
178180
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
179-
set(CPACK_PACKAGE_DESCRIPTION "A client for the LocalCoin network")
180-
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the LocalCoin network")
181+
set(CPACK_PACKAGE_DESCRIPTION "A client for the BitShares network")
182+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A client for the BitShares network")
181183
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
182-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "LocalCoin ${CPACK_PACKAGE_VERSION}")
184+
set(CPACK_PACKAGE_INSTALL_DIRECTORY "BitShares ${CPACK_PACKAGE_VERSION}")
183185

184186
if(WIN32)
185187
SET(CPACK_GENERATOR "ZIP;NSIS")
186-
set(CPACK_PACKAGE_NAME "LocalCoin") # override above
188+
set(CPACK_PACKAGE_NAME "BitShares") # override above
187189
set(CPACK_NSIS_EXECUTABLES_DIRECTORY .)
188-
set(CPACK_NSIS_PACKAGE_NAME "LocalCoin v${CPACK_PACKAGE_VERSION}")
190+
set(CPACK_NSIS_PACKAGE_NAME "BitShares v${CPACK_PACKAGE_VERSION}")
189191
set(CPACK_NSIS_DISPLAY_NAME "${CPACK_NSIS_PACKAGE_NAME}")
190-
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"LocalCoin\\\"")
192+
set(CPACK_NSIS_DEFINES " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"BitShares\\\"")
191193
# it seems like windows zip files usually don't have a single directory inside them, unix tgz frequently do
192194
SET(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 0)
193195

@@ -205,3 +207,7 @@ endif(LINUX)
205207

206208
include(CPack)
207209
endif(ENABLE_INSTALLER)
210+
211+
MESSAGE( STATUS "" )
212+
MESSAGE( STATUS "PROFILER: ${USE_PROFILER}" )
213+
MESSAGE( STATUS "" )

0 commit comments

Comments
 (0)