Merge pull request #612 from sgeto/win32_install

Install things where MSVC and MinGW expect them

diff --combined CMakeLists.txt
index 27a64a0011a666489046e7fe8aa10abe845ea895,05053d4153a110816373c7db3b7de8bd2f01aa12..08b60043c8743aaf5f7ef9f6555f64b7f7647390
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -434,7 -434,7 +434,7 @@@ elseif(PCAP_TYPE STREQUAL "dlpi"
      # existence of the structure type, so we use
      # check_struct_has_member() and look for dl_primitive.
      #
 -    check_struct_has_member("dl_passive_req_t" dl_primitive sys/types.h sys/dlpi.h HAVE_DLPI_PASSIVE)
 +    check_struct_has_member("dl_passive_req_t" dl_primitive "sys/types.h;sys/dlpi.h" HAVE_DLPI_PASSIVE)
  elseif(PCAP_TYPE STREQUAL "linux")
      #
      # Do we have the wireless extensions?
@@@ -508,7 -508,7 +508,7 @@@ elseif(PCAP_TYPE STREQUAL "bpf"
      #
      # Check whether we have the *BSD-style ioctls.
      #
 -    check_include_file(net/if_media.h HAVE_NET_IF_MEDIA_H)
 +    check_include_files("sys/types.h;net/if_media.h" HAVE_NET_IF_MEDIA_H)
  
      #
      # Check whether we have struct BPF_TIMEVAL.
@@@ -593,6 -593,7 +593,6 @@@ if(NOT WIN32
                  # just SIOCGIFCONF.
                  #
                  try_compile(HAVE_SIOCGLIFCONF ${CMAKE_CURRENT_BINARY_DIR} "${pcap_SOURCE_DIR}/cmake/have_siocglifconf.c" )
 -                message(STATUS "HAVE_SIOCGLIFCONF = ${HAVE_SIOCGLIFCONF}")
                  if(HAVE_SIOCGLIFCONF)
                      set(FINDALLDEVS_TYPE glifc)
                  else()
@@@ -804,7 -805,7 +804,7 @@@ add_library(${LIBRARY_NAME}_static STAT
  add_dependencies(${LIBRARY_NAME}_static SerializeTarget)
  
  if(MSVC)
-     set_target_properties(${LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}_static")
+     set_target_properties(${LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}_static" COMPILE_OPTIONS "/Z7")
  else(MSVC)
      set_target_properties(${LIBRARY_NAME}_static PROPERTIES OUTPUT_NAME "${LIBRARY_NAME}")
  endif(MSVC)
@@@ -820,7 -821,24 +820,24 @@@ configure_file(${CMAKE_CURRENT_SOURCE_D
  ######################################
  # Install pcap library and include files
  ######################################
- install(TARGETS ${LIBRARY_NAME} DESTINATION lib)
- install(TARGETS ${LIBRARY_NAME}_static DESTINATION lib)
+ if(WIN32)
+     if(NOT CMAKE_CL_64)
+         install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME}_static
+                 RUNTIME DESTINATION bin
+                 LIBRARY DESTINATION lib
+                 ARCHIVE DESTINATION lib)
+         install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}> DESTINATION bin OPTIONAL)
+     else(NOT CMAKE_CL_64)
+         install(TARGETS ${LIBRARY_NAME} ${LIBRARY_NAME}_static
+                 RUNTIME DESTINATION bin/amd64
+                 LIBRARY DESTINATION lib/amd64
+                 ARCHIVE DESTINATION lib/amd64)
+         install(FILES $<TARGET_PDB_FILE:${LIBRARY_NAME}> DESTINATION bin/amd64 OPTIONAL)
+     endif(NOT CMAKE_CL_64)
+ else(WIN32)
+     install(TARGETS ${LIBRARY_NAME} DESTINATION lib)
+     install(TARGETS ${LIBRARY_NAME}_static DESTINATION lib)
+ endif(WIN32)
+ 
  install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/pcap/ DESTINATION include/pcap)
  install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pcap.h DESTINATION include)