Merge pull request #108 from trondn/cmake-build-fix

CMake build-related fixes
This commit is contained in:
Nick Mathewson 2014-02-14 22:51:11 -05:00
commit 565ea26bed
2 changed files with 19 additions and 0 deletions

15
.gitignore vendored
View File

@ -99,3 +99,18 @@ libevent_openssl.pc
/test/test-changelist
/test/test-fdleak
# Files generated by cmake
/CMakeCache.txt
/CMakeFiles/
/CTestTestfile.cmake
/DartConfiguration.tcl
/LibeventConfig.cmake
/LibeventConfigVersion.cmake
/LibeventTargets.cmake
/bin/
/cmake_install.cmake
/include/evconfig-private.h
/lib/
/tmp/
/verify_tests.sh

View File

@ -119,6 +119,10 @@ endif()
if (APPLE)
# Get rid of deprecated warnings for OpenSSL on OSX 10.7 and greater.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations")
# Get rid of "clang: warning: argument unused during compilation: -I etc
if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments")
endif()
endif()
# Winsock.