Include epan header files in VS solution.

Add header files lists to add_library() so that Visual Studio can pick them
up and include them in a "Header Files" folder for easier navigation within
Visual Studio.

Change-Id: I7cd8e39550f4db67eed8205593060ae8b4a5b1b9
Reviewed-on: https://code.wireshark.org/review/31289
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>

6 files changed, 79 insertions, 1 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 651a8d2711..bd13510591 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -185,6 +185,10 @@ set(LIBWIRESHARK_PUBLIC_HEADERS
 	xdlc.h
 )
 
+set(LIBWIRESHARK_HEADER_FILES
+	${LIBWIRESHARK_PUBLIC_HEADERS}
+)
+
 set(LIBWIRESHARK_NONGENERATED_FILES
 	addr_and_mask.c
 	addr_resolv.c
@@ -293,6 +297,9 @@ set_source_files_properties(
 )
 
 add_library(epan
+	#Included so that Visual Studio can properly put header files in solution
+	${LIBWIRESHARK_HEADER_FILES}
+
 	${LIBWIRESHARK_FILES}
 	$<TARGET_OBJECTS:crypt>
 	$<TARGET_OBJECTS:dfilter>
diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt
index 3d3eea91d1..d534fa6a64 100644
--- a/epan/crypt/CMakeLists.txt
+++ b/epan/crypt/CMakeLists.txt
@@ -14,6 +14,18 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}
 )
 
+set(CRYPT_HEADER_FILES
+	dot11decrypt_debug.h
+	dot11decrypt_int.h
+	dot11decrypt_interop.h
+	dot11decrypt_rijndael.h
+	dot11decrypt_system.h
+	dot11decrypt_user.h
+	dot11decrypt_ws.h
+	kasumi.h
+	wep-wpadefs.h
+)
+
 set(CRYPT_FILES
 	dot11decrypt.c
 	dot11decrypt_ccmp.c
@@ -30,6 +42,9 @@ set_source_files_properties(
 )
 
 add_library(crypt OBJECT
+	#Included so that Visual Studio can properly put header files in solution
+	${CRYPT_HEADER_FILES}
+
 	${CRYPT_FILES}
 )
 
diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt
index 14fcd63a6a..ef584e58e7 100644
--- a/epan/dfilter/CMakeLists.txt
+++ b/epan/dfilter/CMakeLists.txt
@@ -19,6 +19,23 @@ set(DFILTER_PUBLIC_HEADERS
 	drange.h
 )
 
+set(DFILTER_HEADER_FILES
+	${DFILTER_PUBLIC_HEADERS}
+	dfilter-int.h
+	dfilter-macro.h
+	dfilter.h
+	dfunctions.h
+	dfvm.h
+	drange.h
+	gencode.h
+	semcheck.h
+	sttype-function.h
+	sttype-range.h
+	sttype-set.h
+	sttype-test.h
+	syntax-tree.h
+)
+
 set(DFILTER_NONGENERATED_FILES
 	dfilter.c
 	dfilter-macro.c
@@ -58,7 +75,13 @@ set_source_files_properties(
 	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
 )
 
-add_library(dfilter OBJECT ${DFILTER_FILES})
+add_library(dfilter OBJECT
+
+	#Included so that Visual Studio can properly put header files in solution
+	${DFILTER_HEADER_FILES}
+
+	${DFILTER_FILES}
+)
 
 set_target_properties(dfilter PROPERTIES
 	FOLDER "Libs/epan/dfilter"
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 86e8c72340..118df10ad9 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -562,6 +562,7 @@ set(DISSECTOR_PUBLIC_HEADERS
 	packet-tcap.h
 	packet-tcp.h
 	packet-tetra.h
+	packet-thrift.h
 	packet-tls-utils.h
 	packet-tls.h
 	packet-tn3270.h
@@ -616,6 +617,10 @@ set(DISSECTOR_PUBLIC_HEADERS
 	packet-ziop.h
 )
 
+set(DISSECTOR_HEADER_FILES
+	${DISSECTOR_PUBLIC_HEADERS}
+)
+
 set(DISSECTOR_SRC
 	${CMAKE_CURRENT_SOURCE_DIR}/file-btsnoop.c
 	${CMAKE_CURRENT_SOURCE_DIR}/file-elf.c
@@ -1965,6 +1970,10 @@ set_source_files_properties(
 )
 
 add_library(dissectors OBJECT
+	#Included so that Visual Studio can properly put header files in solution
+	${DISSECTOR_HEADER_FILES}
+
+
 	${DISSECTOR_FILES}
 	${DISSECTOR_SUPPORT_SRC}
 )
diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt
index 606eccdd97..56c0efd8c6 100644
--- a/epan/ftypes/CMakeLists.txt
+++ b/epan/ftypes/CMakeLists.txt
@@ -17,6 +17,11 @@ set(FTYPE_PUBLIC_HEADERS
 	ftypes.h
 )
 
+set(FTYPE_HEADER_FILES
+	${FTYPE_PUBLIC_HEADERS}
+	ftypes-int.h
+)
+
 set(FTYPE_FILES
 	ftypes.c
 	ftype-bytes.c
@@ -41,6 +46,9 @@ set_source_files_properties(
 )
 
 add_library(ftypes OBJECT
+	#Included so that Visual Studio can properly put header files in solution
+	${FTYPE_HEADER_FILES}
+
 	${FTYPE_FILES}
 )
 
diff --git a/epan/wmem/CMakeLists.txt b/epan/wmem/CMakeLists.txt
index 98d96424c2..e66007e448 100644
--- a/epan/wmem/CMakeLists.txt
+++ b/epan/wmem/CMakeLists.txt
@@ -29,6 +29,19 @@ set(WMEM_PUBLIC_HEADERS
 	wmem_user_cb.h
 )
 
+set(WMEM_HEADER_FILES
+	${WMEM_PUBLIC_HEADERS}
+	wmem_allocator.h
+	wmem_allocator_block.h
+	wmem_allocator_block_fast.h
+	wmem_allocator_simple.h
+	wmem_allocator_strict.h
+	wmem_interval_tree.h
+	wmem_map_int.h
+	wmem_tree-int.h
+	wmem_user_cb_int.h
+)
+
 set(WMEM_FILES
 	wmem_array.c
 	wmem_core.c
@@ -56,6 +69,9 @@ set_source_files_properties(
 )
 
 add_library(wmem OBJECT
+	#Included so that Visual Studio can properly put header files in solution
+	${WMEM_HEADER_FILES}
+
 	${WMEM_FILES}
 )