diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-24 16:55:27 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-02-25 04:54:41 +0000 |
| commit | bc9c6c6728c9247f91f9dd456a233f0ac434a56d (patch) | |
| tree | 6032ea7d0cd052e80347f24a849edea972c67a39 /epan/CMakeLists.txt | |
| parent | 394eaa1c20a43d75e59e14bc1d3e968451f880e4 (diff) | |
Cleanup CMakeLists.txt indentation and use lower case function names
Change-Id: Ie94d2e9b6b4975d7caec10c3ce472cafe1eefd62
Reviewed-on: https://code.wireshark.org/review/14120
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/CMakeLists.txt')
| -rw-r--r-- | epan/CMakeLists.txt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 6b15f30ec3..e1e29b371d 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -1572,7 +1572,7 @@ set(NGHTTP2_FILES ) source_group(nghttp2 FILES ${NGHTTP2_FILES}) -ADD_CUSTOM_TARGET( +add_custom_target( update-sminmpec COMMAND ${PERL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl @@ -1582,9 +1582,9 @@ ADD_CUSTOM_TARGET( ) set_target_properties(update-sminmpec PROPERTIES FOLDER "tools") -ADD_CUSTOM_COMMAND( - OUTPUT ps.c - COMMAND ${PYTHON_EXECUTABLE} +add_custom_command( + OUTPUT ps.c + COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/rdps.py ${CMAKE_CURRENT_SOURCE_DIR}/print.ps ps.c @@ -1699,15 +1699,11 @@ add_lemon_files(LIBWIRESHARK_FILES set(epan_LIBS wiretap wsutil -# @SSL_LIBS@ ${GLIB2_LIBRARIES} ${PCAP_LIBRARIES} -# @SOCKET_LIBS@ -# @NSL_LIBS@ ${CARES_LIBRARIES} ${ADNS_LIBRARIES} ${KERBEROS_LIBRARIES} -# @FRAMEWORKS@ ${GEOIP_LIBRARIES} ${GCRYPT_LIBRARIES} ${GNUTLS_LIBRARIES} @@ -1827,7 +1823,7 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz # By default the name for a library with target name epan will be libepan, # but Ethereal is now named Wireshark -SET_TARGET_PROPERTIES(epan PROPERTIES +set_target_properties(epan PROPERTIES OUTPUT_NAME "wireshark" PREFIX "lib" FOLDER "DLLs" |