CMake now successfully builds dumpcap

svn path=/trunk/; revision=28745

5 files changed, 87 insertions, 12 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f3e373c19..fae6081b62 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,10 @@
 
 project(wireshark C)
 
-set(dumpcap_LIBS wiretap)
+set(dumpcap_LIBS
+  wiretap
+  wsutil
+)
 
 cmake_minimum_required(VERSION 2.6)
 
@@ -45,6 +48,7 @@ include_directories(
   ${CMAKE_SOURCE_DIR}
   ${CMAKE_SOURCE_DIR}/include
   ${CMAKE_SOURCE_DIR}/wiretap
+  ${CMAKE_SOURCE_DIR}/wsutil
 )
 
 #Where to put libraries
@@ -114,9 +118,9 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "capture packet")
 set(CPACK_PACKAGE_VENDOR "wireshark")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-set(CPACK_PACKAGE_VERSION_MAJOR "0")
-set(CPACK_PACKAGE_VERSION_MINOR "99")
-set(CPACK_PACKAGE_VERSION_PATCH "4")
+set(CPACK_PACKAGE_VERSION_MAJOR "1")
+set(CPACK_PACKAGE_VERSION_MINOR "3")
+set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
 set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
@@ -212,7 +216,10 @@ endif(WIN32)
 
 configure_file(${CMAKE_SOURCE_DIR}/cmakeconfig.h.in ${CMAKE_BINARY_DIR}/config.h)
 
-link_directories(wiretap)
+link_directories(
+  wiretap
+  wsutil
+)
 
 ADD_CUSTOM_COMMAND(
    OUTPUT ${CMAKE_BINARY_DIR}/svnversion.h
diff --git a/cmake/modules/FindLEX.cmake b/cmake/modules/FindLEX.cmake
index 38dfeac5d4..cdaaf7f715 100644
--- a/cmake/modules/FindLEX.cmake
+++ b/cmake/modules/FindLEX.cmake
@@ -38,19 +38,18 @@ MACRO(ADD_LEX_FILES _sources )
       GET_FILENAME_COMPONENT(_basename ${_current_FILE} NAME_WE)
 
       SET(_outc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.c)
-      SET(_outh ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h)
 
       ADD_CUSTOM_COMMAND(
-         OUTPUT ${_outc} ${_outh}
-         COMMAND ${LEX_EXECUTABLE}
+         OUTPUT ${_outc}
+#	COMMAND ${LEX_EXECUTABLE}
+         COMMAND ${CMAKE_SOURCE_DIR}/tools/runlex.sh ${LEX_EXECUTABLE}
          ARGS
          -o${_outc}
-         --header-file=${_outh}
          ${_in}
          DEPENDS ${_in}
       )
 
-      SET(${_sources} ${${_sources}} ${_outc} ${_outh} )
+      SET(${_sources} ${${_sources}} ${_outc} )
    ENDFOREACH (_current_FILE)
 ENDMACRO(ADD_LEX_FILES)
 
diff --git a/cmake/modules/FindSED.cmake b/cmake/modules/FindSED.cmake
new file mode 100644
index 0000000000..fb79fd8c9e
--- /dev/null
+++ b/cmake/modules/FindSED.cmake
@@ -0,0 +1,31 @@
+# - Find unix commands from cygwin
+# This module looks for some usual Unix commands.
+#
+
+INCLUDE(FindCygwin)
+
+FIND_PROGRAM(SED_EXECUTABLE
+  NAMES 
+  sed
+  PATH
+  ${CYGWIN_INSTALL_PATH}/bin
+  /bin
+  /usr/bin 
+  /usr/local/bin
+  /sbin
+)
+MARK_AS_ADVANCED(
+  SED_EXECUTABLE
+)
+
+
+# search sed
+MACRO(FIND_SED)
+    IF(NOT SED_EXECUTABLE)
+        FIND_PROGRAM(SED_EXECUTABLE sed)
+        IF (NOT SED_EXECUTABLE)
+          MESSAGE(FATAL_ERROR "sed not found - aborting")
+        ENDIF (NOT SED_EXECUTABLE)
+    ENDIF(NOT SED_EXECUTABLE)
+ENDMACRO(FIND_SED)
+
diff --git a/cmake/modules/FindYACC.cmake b/cmake/modules/FindYACC.cmake
index c12a4c8226..01dbe11615 100644
--- a/cmake/modules/FindYACC.cmake
+++ b/cmake/modules/FindYACC.cmake
@@ -20,12 +20,12 @@ MARK_AS_ADVANCED(
 )
 
 
-# search flex
+# search bison/yacc
 MACRO(FIND_YACC)
     IF(NOT YACC_EXECUTABLE)
         FIND_PROGRAM(YACC_EXECUTABLE bison)
         IF (NOT YACC_EXECUTABLE)
-          MESSAGE(FATAL_ERROR "flex not found - aborting")
+          MESSAGE(FATAL_ERROR "bison/yacc not found - aborting")
         ENDIF (NOT YACC_EXECUTABLE)
     ENDIF(NOT YACC_EXECUTABLE)
 ENDMACRO(FIND_YACC)
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
new file mode 100644
index 0000000000..f97309702c
--- /dev/null
+++ b/wsutil/CMakeLists.txt
@@ -0,0 +1,38 @@
+# CMakeLists.txt
+#
+# $Id$
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+
+set(WSUTIL_FILES
+	file_util.c
+	mpeg-audio.c
+	privileges.c
+	str_util.c
+	type_util.c
+	unicode-utils.c
+)
+
+add_library(wsutil SHARED 
+	${WUTIL_FILES}
+)
+
+install(TARGETS wsutil LIBRARY DESTINATION lib)