diff options
| author | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-23 21:06:31 +0000 |
|---|---|---|
| committer | stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-09-23 21:06:31 +0000 |
| commit | c42bc4465c0df1ff54f7f4c9db7d5a99a15e2493 (patch) | |
| tree | 76f42010d2d1355347e3154e75d43b8103920a58 /CMakeLists.txt | |
| parent | e4d6912ff66c50062b682b08c7701af60ae330fb (diff) | |
Some CMake fixes from H.sivank:
- Apple gcc does not like "-Wl,--as-needed".
- Fix plugins link step on OSX.
- Put AUTHORS-SHORT, AUTHORS-SHORT-FORMAT and wireshark.pod in build directory.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34224 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6bc3ae7cd2..92bf6e1a9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,12 +184,14 @@ else() add_definitions( -D_U_=\"\" ) endif() -set(WIRESHARK_LD_FLAGS - -Wl,--as-needed - # -flto - # -fwhopr - # -fwhole-program -) +if (NOT APPLE) + set(WIRESHARK_LD_FLAGS + -Wl,--as-needed + # -flto + # -fwhopr + # -fwhole-program + ) +endif() include(CheckCLinkerFlag) set(C 0) @@ -210,7 +212,11 @@ if(ENABLE_STATIC) set(LINK_MODE_MODULE STATIC) else() set(LINK_MODE_LIB SHARED) - set(LINK_MODE_MODULE MODULE) + if(APPLE) + set(LINK_MODE_MODULE SHARED) + else(APPLE) + set(LINK_MODE_MODULE MODULE) + endif(APPLE) endif() # The packagelist is doing some magic: If we add XXX to the packagelist, we @@ -830,7 +836,7 @@ ADD_CUSTOM_COMMAND( ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl < ${CMAKE_SOURCE_DIR}/AUTHORS - > AUTHORS-SHORT + > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT DEPENDS ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl @@ -843,16 +849,16 @@ ADD_CUSTOM_COMMAND( COMMAND ${PERL} ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl - < AUTHORS-SHORT - > AUTHORS-SHORT-FORMAT + < ${CMAKE_BINARY_DIR}/AUTHORS-SHORT + > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT COMMAND cat ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template AUTHORS-SHORT-FORMAT - > wireshark.pod + > ${CMAKE_BINARY_DIR}/wireshark.pod DEPENDS ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl - AUTHORS-SHORT + ${CMAKE_BINARY_DIR}/AUTHORS-SHORT ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template ) |