osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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.

svn path=/trunk/; revision=34224
This commit is contained in:
Stig Bjørlykke 2010-09-23 21:06:31 +00:00
parent 838ffd0c72
commit e60eeb3602
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@ -184,12 +184,14 @@ else()
add_definitions( -D_U_=\"\" ) add_definitions( -D_U_=\"\" )
endif() endif()
set(WIRESHARK_LD_FLAGS if (NOT APPLE)
-Wl,--as-needed set(WIRESHARK_LD_FLAGS
# -flto -Wl,--as-needed
# -fwhopr # -flto
# -fwhole-program # -fwhopr
) # -fwhole-program
)
endif()
include(CheckCLinkerFlag) include(CheckCLinkerFlag)
set(C 0) set(C 0)
@ -210,7 +212,11 @@ if(ENABLE_STATIC)
set(LINK_MODE_MODULE STATIC) set(LINK_MODE_MODULE STATIC)
else() else()
set(LINK_MODE_LIB SHARED) 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() endif()
# The packagelist is doing some magic: If we add XXX to the packagelist, we # 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/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
< ${CMAKE_SOURCE_DIR}/AUTHORS < ${CMAKE_SOURCE_DIR}/AUTHORS
> AUTHORS-SHORT > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
DEPENDS DEPENDS
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-short.pl
@ -843,16 +849,16 @@ ADD_CUSTOM_COMMAND(
COMMAND ${PERL} COMMAND ${PERL}
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
< AUTHORS-SHORT < ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
> AUTHORS-SHORT-FORMAT > ${CMAKE_BINARY_DIR}/AUTHORS-SHORT-FORMAT
COMMAND cat COMMAND cat
${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
AUTHORS-SHORT-FORMAT AUTHORS-SHORT-FORMAT
> wireshark.pod > ${CMAKE_BINARY_DIR}/wireshark.pod
DEPENDS DEPENDS
${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl ${CMAKE_SOURCE_DIR}/doc/perlnoutf.pl
${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl ${CMAKE_SOURCE_DIR}/doc/make-authors-format.pl
AUTHORS-SHORT ${CMAKE_BINARY_DIR}/AUTHORS-SHORT
${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template ${CMAKE_SOURCE_DIR}/doc/wireshark.pod.template
) )