6 files changed, 79 insertions, 6 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 4c7d375e12..fec80d289a 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -175,7 +175,7 @@ set(LIBWIRESHARK_CLEAN_FILES
 	${LIBWIRESHARK_FILES}
 )
 
-add_lex_files(LIBWIRESHARK_FILES
+add_lex_files(LEX_FILES GENERATED_FILES
 	diam_dict.l
 	dtd_parse.l
 	dtd_preparse.l
@@ -183,7 +183,7 @@ add_lex_files(LIBWIRESHARK_FILES
 	uat_load.l
 )
 
-add_lemon_files(LIBWIRESHARK_FILES
+add_lemon_files(LEMON_FILES GENERATED_FILES
 	dtd_grammar.lemon
 )
 
@@ -219,6 +219,7 @@ endif()
 
 add_library(epan ${LINK_MODE_LIB}
 	${LIBWIRESHARK_FILES}
+	${GENERATED_FILES}
 	${COMPRESS_FILES}
 	${LIBWIRESHARK_ASM_FILES}
 	$<TARGET_OBJECTS:crypt>
@@ -341,6 +342,18 @@ set_target_properties(tvbtest PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
+# Commented out as per nmake
+#CHECKAPI(
+#	NAME
+#	  epan
+#	SWITCHES
+#	  -g termoutput -build
+#	SOURCES
+#	  ${LIBWIRESHARK_FILES}
+#	  ${LEX_FILES}
+#	  ${LEMON_FILES}
+#)
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
diff --git a/epan/crypt/CMakeLists.txt b/epan/crypt/CMakeLists.txt
index de05ad62c4..b32d7f6bcc 100644
--- a/epan/crypt/CMakeLists.txt
+++ b/epan/crypt/CMakeLists.txt
@@ -53,6 +53,15 @@ set_target_properties(crypt PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
+CHECKAPI(
+	NAME
+	  crypt
+	SWITCHES
+	  -g termoutput -build
+	SOURCES
+	  ${CRYPT_FILES}
+)
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
diff --git a/epan/dfilter/CMakeLists.txt b/epan/dfilter/CMakeLists.txt
index 0b59c34f7b..102724921b 100644
--- a/epan/dfilter/CMakeLists.txt
+++ b/epan/dfilter/CMakeLists.txt
@@ -51,16 +51,17 @@ if(WERROR_COMMON_FLAGS)
 	)
 endif()
 
-add_lex_files(DFILTER_FILES
+add_lex_files(LEX_FILES GENERATED_FILES
 	scanner.l
 )
 
-add_lemon_files(DFILTER_FILES
+add_lemon_files(LEMON_FILES GENERATED_FILES
 	grammar.lemon
 )
 
 add_library(dfilter OBJECT
 	${DFILTER_FILES}
+	${GENERATED_FILES}
 )
 
 set_target_properties(dfilter PROPERTIES
@@ -68,6 +69,18 @@ set_target_properties(dfilter PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
+CHECKAPI(
+	NAME
+	  dfilter
+	SWITCHES
+	  -g termoutput -build
+	SOURCES
+	  ${DFILTER_FILES}
+# LEX files commented out due to use of malloc, free etc.
+#	  ${LEX_FILES}
+	  ${LEMON_FILES}
+)
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
diff --git a/epan/dissectors/CMakeLists.txt b/epan/dissectors/CMakeLists.txt
index 64f2b6a740..02b56c2a44 100644
--- a/epan/dissectors/CMakeLists.txt
+++ b/epan/dissectors/CMakeLists.txt
@@ -984,7 +984,6 @@ set(DISSECTOR_SRC
 	packet-ncp-nmas.c
 	packet-ncp-sss.c
 	packet-ncp.c
-	packet-ncp2222.c
 	packet-ncs.c
 	packet-ndmp.c
 	packet-ndp.c
@@ -1428,10 +1427,15 @@ set(DISSECTOR_SRC
 set(DISSECTOR_SUPPORT_SRC
 	packet-dcerpc-nt.c
 	usb.c
-	register.c
 )
 source_group(dissector-support FILES ${DISSECTOR_SUPPORT_SRC})
 
+set(DISSECTOR_GENERATED_FILES
+	packet-ncp2222.c
+	register.c
+)
+source_group(dissector-generated FILES ${DISSECTOR_GENERATED_FILES})
+
 set(DISSECTOR_FILES
 	${DISSECTOR_SRC}
 	${PIDL_DISSECTOR_SRC}
@@ -1454,6 +1458,7 @@ set(CLEAN_FILES
 	${PIDL_DISSECTOR_SRC}
 	${ASN1_DISSECTOR_SRC}
 	${DISSECTOR_SUPPORT_SRC}
+	${DISSECTOR_GENERATED_FILES}
 )
 
 if(WERROR_COMMON_FLAGS)
@@ -1467,6 +1472,7 @@ endif()
 add_library(dissectors OBJECT
 	${DISSECTOR_FILES}
 	${DISSECTOR_SUPPORT_SRC}
+	${DISSECTOR_GENERATED_FILES}
 )
 
 set_target_properties(dissectors PROPERTIES
@@ -1474,6 +1480,19 @@ set_target_properties(dissectors PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
+set(CHECKAPI_FILE_LIST "${CMAKE_CURRENT_BINARY_DIR}/files.txt")
+file(GLOB DISSECTOR_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
+file(WRITE "${CHECKAPI_FILE_LIST}" "${DISSECTOR_FILES}")
+CHECKAPI(
+	NAME
+	  dissectors
+	SWITCHES
+	  -g abort -g termoutput -build --file ${CHECKAPI_FILE_LIST}
+	SOURCES
+	  ${DISSECTOR_SUPPORT_SRC}
+	  ${DISSECTOR_HEADERS}
+)
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
diff --git a/epan/ftypes/CMakeLists.txt b/epan/ftypes/CMakeLists.txt
index 306c57817e..245ceb9052 100644
--- a/epan/ftypes/CMakeLists.txt
+++ b/epan/ftypes/CMakeLists.txt
@@ -58,6 +58,16 @@ set_target_properties(ftypes PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
+# Commented out as per nmake
+#CHECKAPI(
+#	NAME
+#	  ftypes
+#	SWITCHES
+#	  -g termoutput -build
+#	SOURCES
+#	  ${FTYPE_FILES}
+#)
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index 7b3ec346db..57ba001661 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -166,6 +166,15 @@ set_target_properties(wslua PROPERTIES
 	COMPILE_DEFINITIONS "WS_BUILD_DLL"
 )
 
+CHECKAPI(
+	NAME
+	  wslua
+	SWITCHES
+	  -g termoutput -build
+	SOURCES
+	  ${WSLUA_FILES}
+)
+
 #
 # Editor modelines  -  http://www.wireshark.org/tools/modelines.html
 #