Attempt to get linking working with cmake - without success so far.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52377 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73acf6044e40fd6be2a254a93eb24321f8d64f48..5301607719130f1da4e4d2012b24578d9834dbe5 100644 (file)
--- 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 (file)
index 0000000..c5d986e
--- /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()