Browse Source

Merge pull request #256 from EinMByte/master

Update .gitignore, fix typo in CMakeLists.txt.
pull/265/head
EinMByte 9 years ago
parent
commit
5db0448c6b
  1. 2
      .gitignore
  2. 5
      build/CMakeLists.txt

2
.gitignore vendored

@ -15,6 +15,8 @@ build/cmake_install.cmake @@ -15,6 +15,8 @@ build/cmake_install.cmake
build/i2pd
build/libcommon.a
build/libi2pd.a
build/CTestTestfile.cmake
build/i2pd_tests
# Autotools

5
build/CMakeLists.txt

@ -119,12 +119,13 @@ if (CXX11_SUPPORTED) @@ -119,12 +119,13 @@ if (CXX11_SUPPORTED)
elseif (CXX0X_SUPPORTED) # gcc 4.6
add_definitions( "-std=c++0x" )
elseif (NOT MSVC)
message(SEND_ERROR "C++11 standart not seems to be supported by compiler. Too old version?")
message(SEND_ERROR "C++11 standard not supported by compiler. Version too old?")
endif ()
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if (WITH_HARDENING)
add_definitions( "-D_FORTIFY_SOURCE=2" )
file (GLOB HEADERS "${CMAKE_SOURCE_DIR}/util/*.h")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security -Werror=format-security" )
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector --param ssp-buffer-size=4" )
endif ()
@ -317,4 +318,4 @@ if (WITH_TESTS) @@ -317,4 +318,4 @@ if (WITH_TESTS)
enable_testing()
add_test(i2pdTest i2pd_tests)
endif ()
endif ()

Loading…
Cancel
Save