X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=CMakeLists.txt;h=51631def1d1522d96208cc54085d32a460f6a515;hb=47d3ceb3da845e216fc9577cbf52f8b5600e5f93;hp=fd7410cbb7da49b1f6c85fb87b5d133f36dcebf4;hpb=d86ff40bf0a5c801f789611b94c8378aac0a7149;p=novacoin.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd7410c..51631de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,7 +43,7 @@ if (NOT MSVC)
 if (NOT WIN32)
 set(FPIC "-fPIC")
 endif()
-set (CMAKE_C_FLAGS "-flto -O3 ${FPIC} -Wno-deprecated -fstack-protector-strong")
+set (CMAKE_C_FLAGS "-flto -O3 ${FPIC} -Wno-deprecated -fstack-protector-all")
 set (CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-parameter -fexceptions -frtti")
 else()
 set(CMAKE_C_FLAGS "/O2")
@@ -63,6 +63,12 @@ option(WITH_TOOLS "Build utility tools"  NO)
 add_subdirectory(src/additional/libqrencode)
 add_subdirectory(src/additional/IXWebSocket)
 
+# Apply patch for IXWebSocket issue
+execute_process (
+    COMMAND sh -c "${CMAKE_CURRENT_SOURCE_DIR}/src/additional/fix_cerrno.sh"
+    OUTPUT_VARIABLE outIxVar
+)
+
 # Set default root path for berkeley db
 if (NOT BerkeleyDB_ROOT)
 set(BerkeleyDB_ROOT /usr)
@@ -237,7 +243,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 BOOST_SPIRIT_THREADSAFE)
+list(APPEND ALL_DEFINITIONS QT_GUI USE_IPV6 BOOST_SPIRIT_THREADSAFE)
 
 # Disable useless targets
 option(LEVELDB_BUILD_TESTS "Build LevelDB's unit tests" OFF)
@@ -266,7 +272,7 @@ add_executable(novacoin-qt WIN32 ${ALL_SOURCES})
 
 if (NOT MSVC)
 list(APPEND ALL_DEFINITIONS _FORTIFY_SOURCE=2)
-set(ALL_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fstack-protector-strong")
+set(ALL_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fstack-protector-all")
 if (WIN32)
 list(APPEND ALL_LIBRARIES mingw32 ssp)
 set(ALL_LINKER_FLAGS "${ALL_LINKER_FLAGS} -static-libgcc -static")