]> The Tcpdump Group git mirrors - tcpdump/commitdiff
Fix conditional addition of source files.
authorGuy Harris <[email protected]>
Tue, 23 Jan 2018 03:43:26 +0000 (19:43 -0800)
committerGuy Harris <[email protected]>
Tue, 23 Jan 2018 03:43:26 +0000 (19:43 -0800)
Conditionally add everything to LOCALSRC and include LOCALSRC in
NETDISSECT_SOURCE_LIST_C.

CMakeLists.txt

index 67aae5ba372efe07a4dfc2bb055d5c3d643cddf9..afde7b21d376e37307794c6d3471a68c6c467884 100644 (file)
@@ -588,6 +588,15 @@ endif(WITH_CAP_NG)
 # Input files
 ######################################
 
+if(ENABLE_SMB)
+    #
+    # We allow the SMB dissector to be omitted.
+    #
+    set(LOCALSRC ${LOCALSRC}
+        print-smb.c
+        smbutil.c)
+endif(ENABLE_SMB)
+
 set(NETDISSECT_SOURCE_LIST_C
     addrtoname.c
     addrtostr.c
@@ -748,21 +757,13 @@ set(NETDISSECT_SOURCE_LIST_C
     print-wb.c
     print-zephyr.c
     print-zeromq.c
+    ${LOCALSRC}
     netdissect.c
     signature.c
     strtoaddr.c
     util-print.c
 )
 
-if(ENABLE_SMB)
-    #
-    # We allow the SMB dissector to be omitted.
-    #
-    set(NETDISSECT_SOURCE_LIST_C ${NETDISSECT_SOURCE_LIST_C}
-        print-smb.c
-        smbutil.c)
-endif(ENABLE_SMB)
-
 #
 # Replace missing functions
 #