diff options
author | Andreas Schneider <mail@cynapses.org> | 2009-07-21 14:12:25 +0200 |
---|---|---|
committer | Andreas Schneider <mail@cynapses.org> | 2009-07-21 14:12:25 +0200 |
commit | 19c3d02805643c004c1e669d34018ed570146418 (patch) | |
tree | 260452468b7b74c5e9a9f460bc8981ab4640b001 | |
parent | b534bfc520282a533fabf72c36f554b035460d6d (diff) | |
parent | ef2c8d66f10117fccddc35a923ac06ce197b124c (diff) | |
download | libssh-19c3d02805643c004c1e669d34018ed570146418.tar.gz libssh-19c3d02805643c004c1e669d34018ed570146418.tar.xz libssh-19c3d02805643c004c1e669d34018ed570146418.zip |
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
-rw-r--r-- | cmake/Modules/DefineCompilerFlags.cmake | 85 |
1 files changed, 43 insertions, 42 deletions
diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake index 26cee6c8..90bfbaf3 100644 --- a/cmake/Modules/DefineCompilerFlags.cmake +++ b/cmake/Modules/DefineCompilerFlags.cmake @@ -3,47 +3,48 @@ include(CheckCCompilerFlag) if (UNIX AND NOT WIN32) - # with -fPIC - check_c_compiler_flag("-fPIC" WITH_FPIC) - if (WITH_FPIC) - add_definitions(-fPIC) - endif (WITH_FPIC) - - if (CMAKE_SIZEOF_VOID_P MATCHES "8") - # with large file support - execute_process( - COMMAND - getconf LFS64_CFLAGS - OUTPUT_VARIABLE - _lfs_CFLAGS - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - else (CMAKE_SIZEOF_VOID_P MATCHES "8") - # with large file support - execute_process( - COMMAND - getconf LFS_CFLAGS - OUTPUT_VARIABLE - _lfs_CFLAGS - ERROR_QUIET - OUTPUT_STRIP_TRAILING_WHITESPACE + if (CMAKE_COMPILER_IS_GNUCC) + add_definitions(-Wall -Wextra -Wmissing-prototypes -Wdeclaration-after-statement -Wunused) + + # with -fPIC + check_c_compiler_flag("-fPIC" WITH_FPIC) + if (WITH_FPIC) + add_definitions(-fPIC) + endif (WITH_FPIC) + + if (CMAKE_SIZEOF_VOID_P MATCHES "8") + # with large file support + execute_process( + COMMAND + getconf LFS64_CFLAGS + OUTPUT_VARIABLE + _lfs_CFLAGS + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE ) - string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}") - - add_definitions(${_lfs_CFLAGS}) - endif (CMAKE_SIZEOF_VOID_P MATCHES "8") - - add_definitions(-Wall -Wextra -Wmissing-prototypes -Wdeclaration-after-statement -Wunused) - - check_c_compiler_flag("-fstack-protector" WITH_STACK_PROTECTOR) - if (WITH_STACK_PROTECTOR) - add_definitions(-fstack-protector) - endif (WITH_STACK_PROTECTOR) - - check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) - if (WITH_FORTIFY_SOURCE) - add_definitions(-D_FORTIFY_SOURCE=2) - endif (WITH_FORTIFY_SOURCE) - + else (CMAKE_SIZEOF_VOID_P MATCHES "8") + # with large file support + execute_process( + COMMAND + getconf LFS_CFLAGS + OUTPUT_VARIABLE + _lfs_CFLAGS + ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}") + + add_definitions(${_lfs_CFLAGS}) + endif (CMAKE_SIZEOF_VOID_P MATCHES "8") + + check_c_compiler_flag("-fstack-protector" WITH_STACK_PROTECTOR) + if (WITH_STACK_PROTECTOR) + add_definitions(-fstack-protector) + endif (WITH_STACK_PROTECTOR) + + check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) + if (WITH_FORTIFY_SOURCE) + add_definitions(-D_FORTIFY_SOURCE=2) + endif (WITH_FORTIFY_SOURCE) + endif (CMAKE_COMPILER_IS_GNUCC) endif (UNIX AND NOT WIN32) |