diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-10-05 10:17:21 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-10-05 10:17:21 +0000 |
| commit | 7b3ac2ae6bdeac058c02d0d7f6d071f85dc04b91 (patch) | |
| tree | 9418b2f62f814d3eaa89371212e7466fba2090da | |
| parent | 438f4be98ab75e7fa2d075ffecefa00256065652 (diff) | |
| download | wireshark-7b3ac2ae6bdeac058c02d0d7f6d071f85dc04b91.tar.gz | |
Attempt to get linking working with cmake - without success so far.
svn path=/trunk/; revision=52377
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/modules/UseWinLibs.cmake | 17 |
2 files changed, 20 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 73acf6044e..5301607719 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -465,6 +465,9 @@ foreach(PACKAGE ${PACKAGELIST}) endif() endforeach() +# Provide Windows system lib names +include( UseWinLibs ) + #packaging include(CPackConfig.txt) diff --git a/cmake/modules/UseWinLibs.cmake b/cmake/modules/UseWinLibs.cmake new file mode 100644 index 0000000000..c5d986e072 --- /dev/null +++ b/cmake/modules/UseWinLibs.cmake @@ -0,0 +1,17 @@ +# +# $Id$ +# + +# Right now this is a more or less inelegant hack to get Windows +# builds going with MSVC + +if( WIN32 ) + + # We might need something like "if (CMAKE_COMPILER_ID MATCHES "MSVC")" + # here to support other compilers on Windows. + + set( WIN_SETARGV_OBJECT setargv.obj ) + + set( WS_LINK_FLAGS ${WS_LINK_FLAGS} "${WIN_SETARGV_OBJECT}" ) + +endif() |