diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-05 10:01:24 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-10-05 10:01:24 +0200 |
| commit | 40778d4ba94ab5bfbe71bd3a304d6664c9a02560 (patch) | |
| tree | 5864e2c4bda6c2d1782ef0ba765a40fcd8b8e8c5 /cmake/Modules/DefineCompilerFlags.cmake | |
| parent | a3a7f17d0f971edce873970863cfe660b21d8f57 (diff) | |
| parent | 60d6954b7560df62634b305fec65dffbc98ff0b8 (diff) | |
| download | libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.gz libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.tar.xz libssh-40778d4ba94ab5bfbe71bd3a304d6664c9a02560.zip | |
Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Diffstat (limited to 'cmake/Modules/DefineCompilerFlags.cmake')
| -rw-r--r-- | cmake/Modules/DefineCompilerFlags.cmake | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/cmake/Modules/DefineCompilerFlags.cmake b/cmake/Modules/DefineCompilerFlags.cmake index dafc7996..1ec2cf98 100644 --- a/cmake/Modules/DefineCompilerFlags.cmake +++ b/cmake/Modules/DefineCompilerFlags.cmake @@ -13,31 +13,6 @@ if (UNIX AND NOT WIN32) 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 - ) - 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) @@ -48,9 +23,34 @@ if (UNIX AND NOT WIN32) add_definitions(-D_FORTIFY_SOURCE=2) endif (WITH_FORTIFY_SOURCE) - # Set linker flags - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed") endif (CMAKE_COMPILER_IS_GNUCC) + + 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 + ) + endif (CMAKE_SIZEOF_VOID_P MATCHES "8") + if (_lfs_CFLAGS) + string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}") + add_definitions(${_lfs_CFLAGS}) + endif (_lfs_CFLAGS) + endif (UNIX AND NOT WIN32) # suppress warning about "deprecated" functions |