X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=CMakeLists.txt;h=5a45b9793e586769e8ec6591621f733ca48de628;hb=00a7d307ccdb4b03ba9284be317fc588bd30504e;hp=108de955a48b535ffb76521e9e590ae19f392cd1;hpb=9f46e1b71504b8593fb0f1d0c4b9c4373173750d;p=novacoin.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 108de95..5a45b97 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,11 +51,15 @@ set(CMAKE_CXX_FLAGS "/O2 /GR /EHsc")
 endif()
 
 set(Boost_USE_STATIC_LIBS   ON)
+if(WIN32)
 set(Boost_USE_STATIC_RUNTIME ON)
+endif()
 find_package(Boost REQUIRED COMPONENTS atomic chrono filesystem program_options system thread)
 set(OPENSSL_USE_STATIC_LIBS ON)
 find_package(OpenSSL REQUIRED)
 
+# Disable compiling qrencode executables
+option(WITH_TOOLS "Build utility tools"  NO)
 add_subdirectory(src/additional/libqrencode)
 add_subdirectory(src/additional/IXWebSocket)
 
@@ -227,7 +231,7 @@ if (NOT BDB_FOUND)
     message(FATAL_ERROR "Unable to find ${BerkeleyDB_LIB_name} library in ${BerkeleyDB_LIBS} directory. Try to specify either library path via BerkeleyDB_LIBS or berkeley db root path via BerkeleyDB_ROOT variable. You can also use BerkeleyDB_LIB_name variable to provide alternative file name search for.")
 endif()
 
-list(APPEND ALL_DEFINITIONS QT_GUI USE_QRCODE USE_IPV6)
+list(APPEND ALL_DEFINITIONS QT_GUI USE_QRCODE USE_IPV6 BOOST_SPIRIT_THREADSAFE)
 
 if(USE_LEVELDB)
     # Disable useless targets
@@ -260,10 +264,9 @@ list(APPEND ALL_DEFINITIONS HAVE_BUILD_INFO)
 add_executable(novacoin-qt WIN32 ${ALL_SOURCES})
 
 if (NOT MSVC)
-list(APPEND ALL_LIBRARIES ssp)
 list(APPEND ALL_DEFINITIONS _FORTIFY_SOURCE=2)
 if (WIN32)
-list(APPEND ALL_LIBRARIES mingw32)
+list(APPEND ALL_LIBRARIES mingw32 ssp)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static")
 endif()
 endif()