Cleanup CMakeLists.txt indentation and use lower case function names

Change-Id: Ie94d2e9b6b4975d7caec10c3ce472cafe1eefd62
Reviewed-on: https://code.wireshark.org/review/14120
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

2 files changed, 60 insertions, 62 deletions

diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt
index 6b15f30ec3..e1e29b371d 100644
--- a/epan/CMakeLists.txt
+++ b/epan/CMakeLists.txt
@@ -1572,7 +1572,7 @@ set(NGHTTP2_FILES
 )
 source_group(nghttp2 FILES ${NGHTTP2_FILES})
 
-ADD_CUSTOM_TARGET(
+add_custom_target(
 	update-sminmpec
 	COMMAND ${PERL_EXECUTABLE}
 		${CMAKE_SOURCE_DIR}/tools/make-sminmpec.pl
@@ -1582,9 +1582,9 @@ ADD_CUSTOM_TARGET(
 )
 set_target_properties(update-sminmpec PROPERTIES FOLDER "tools")
 
-ADD_CUSTOM_COMMAND(
-	OUTPUT	ps.c
-	COMMAND	${PYTHON_EXECUTABLE}
+add_custom_command(
+	OUTPUT ps.c
+	COMMAND ${PYTHON_EXECUTABLE}
 		${CMAKE_SOURCE_DIR}/tools/rdps.py
 		${CMAKE_CURRENT_SOURCE_DIR}/print.ps
 		ps.c
@@ -1699,15 +1699,11 @@ add_lemon_files(LIBWIRESHARK_FILES
 set(epan_LIBS
 	wiretap
 	wsutil
-#	@SSL_LIBS@
 	${GLIB2_LIBRARIES}
 	${PCAP_LIBRARIES}
-#	@SOCKET_LIBS@
-#	@NSL_LIBS@
 	${CARES_LIBRARIES}
 	${ADNS_LIBRARIES}
 	${KERBEROS_LIBRARIES}
-#	@FRAMEWORKS@
 	${GEOIP_LIBRARIES}
 	${GCRYPT_LIBRARIES}
 	${GNUTLS_LIBRARIES}
@@ -1827,7 +1823,7 @@ add_custom_command(OUTPUT libwireshark.abi.tar.gz
 
 # By default the name for a library with target name epan will be libepan,
 # but Ethereal is now named Wireshark
-SET_TARGET_PROPERTIES(epan PROPERTIES
+set_target_properties(epan PROPERTIES
 	OUTPUT_NAME "wireshark"
 	PREFIX "lib"
 	FOLDER "DLLs"
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index 8669e101bb..6541df806e 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -76,71 +76,73 @@ macro(WSLUA_GENERATE_TAP_SRC)
 		${CMAKE_SOURCE_DIR}/epan/dissectors/packet-ieee80211.h
 	)
 
-	ADD_CUSTOM_COMMAND(
-	    OUTPUT
-	      ${CMAKE_BINARY_DIR}/epan/wslua/taps_wslua.c
-	      ${CMAKE_BINARY_DIR}/epan/wslua/taps.txt
-	    COMMAND ${PERL_EXECUTABLE}
-	      ${CMAKE_SOURCE_DIR}/epan/wslua/make-taps.pl
-	      ${CMAKE_SOURCE_DIR}/epan/wslua/taps
-	      ${CMAKE_BINARY_DIR}/epan/wslua/taps_wslua.c
-	      ${CMAKE_BINARY_DIR}/epan/wslua/taps.txt
-	      ${CMAKE_SOURCE_DIR}/epan/wslua
-	    WORKING_DIRECTORY
-	      ${CMAKE_SOURCE_DIR}/epan/wslua
-	    DEPENDS
-	      ${CMAKE_SOURCE_DIR}/epan/wslua/taps
-	      ${CMAKE_SOURCE_DIR}/epan/wslua/make-taps.pl
-	      # Only here to add dependencies for the taps "source"files
-	      ${WSLUA_TAPS_USED}
+	add_custom_command(
+		OUTPUT
+			${CMAKE_BINARY_DIR}/epan/wslua/taps_wslua.c
+			${CMAKE_BINARY_DIR}/epan/wslua/taps.txt
+		COMMAND
+			${PERL_EXECUTABLE}
+			${CMAKE_SOURCE_DIR}/epan/wslua/make-taps.pl
+			${CMAKE_SOURCE_DIR}/epan/wslua/taps
+			${CMAKE_BINARY_DIR}/epan/wslua/taps_wslua.c
+			${CMAKE_BINARY_DIR}/epan/wslua/taps.txt
+			${CMAKE_SOURCE_DIR}/epan/wslua
+		WORKING_DIRECTORY
+			${CMAKE_SOURCE_DIR}/epan/wslua
+		DEPENDS
+			${CMAKE_SOURCE_DIR}/epan/wslua/taps
+			${CMAKE_SOURCE_DIR}/epan/wslua/make-taps.pl
+			# Only here to add dependencies for the taps "source"files
+			${WSLUA_TAPS_USED}
 	)
 endmacro()
 
 macro(WSLUA_GENERATE_REG_SRC)
-	ADD_CUSTOM_COMMAND(
-	    OUTPUT
-	      ${CMAKE_BINARY_DIR}/epan/wslua/declare_wslua.h
-	      ${CMAKE_BINARY_DIR}/epan/wslua/register_wslua.c
-	    COMMAND ${PERL_EXECUTABLE}
-	      ${CMAKE_SOURCE_DIR}/epan/wslua/make-reg.pl
-	      ${WSLUA_MODULES}
-	    WORKING_DIRECTORY
-	      ${CMAKE_BINARY_DIR}/epan/wslua
-	    DEPENDS
-	      ${CMAKE_SOURCE_DIR}/epan/wslua/make-reg.pl
-	      ${WSLUA_MODULES}
-	      # ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c
+	add_custom_command(
+		OUTPUT
+			${CMAKE_BINARY_DIR}/epan/wslua/declare_wslua.h
+			${CMAKE_BINARY_DIR}/epan/wslua/register_wslua.c
+		COMMAND
+			${PERL_EXECUTABLE}
+			${CMAKE_SOURCE_DIR}/epan/wslua/make-reg.pl
+			${WSLUA_MODULES}
+		WORKING_DIRECTORY
+			${CMAKE_BINARY_DIR}/epan/wslua
+		DEPENDS
+			${CMAKE_SOURCE_DIR}/epan/wslua/make-reg.pl
+			${WSLUA_MODULES}
+			# ${CMAKE_CURRENT_BINARY_DIR}/taps_wslua.c
 	)
 endmacro()
 
-ADD_CUSTOM_COMMAND(
-    OUTPUT init.lua
-    COMMAND ${PERL_EXECUTABLE}
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl
-      ${CMAKE_SOURCE_DIR}
-      ${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua
-      > init.lua
-    DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl
-      ${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua
-      ${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h
-      ${CMAKE_SOURCE_DIR}/wiretap/wtap.h
-      ${CMAKE_SOURCE_DIR}/epan/epan.h
-      ${CMAKE_SOURCE_DIR}/epan/stat_groups.h
+add_custom_command(
+	OUTPUT init.lua
+	COMMAND ${PERL_EXECUTABLE}
+		${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl
+		${CMAKE_SOURCE_DIR}
+		${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua
+		> init.lua
+	DEPENDS
+		${CMAKE_CURRENT_SOURCE_DIR}/make-init-lua.pl
+		${CMAKE_CURRENT_SOURCE_DIR}/template-init.lua
+		${CMAKE_SOURCE_DIR}/epan/ftypes/ftypes.h
+		${CMAKE_SOURCE_DIR}/wiretap/wtap.h
+		${CMAKE_SOURCE_DIR}/epan/epan.h
+		${CMAKE_SOURCE_DIR}/epan/stat_groups.h
 )
 
 add_custom_target(
-     wsluaauxiliary ALL
-     DEPENDS
-	init.lua
+	wsluaauxiliary ALL
+	DEPENDS
+		init.lua
 )
 set_target_properties(wsluaauxiliary PROPERTIES FOLDER "Auxiliary")
 
 install(
-    FILES
-	console.lua
-	dtd_gen.lua
-	${CMAKE_CURRENT_BINARY_DIR}/init.lua
-    DESTINATION
-	${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}
+	FILES
+		console.lua
+		dtd_gen.lua
+		${CMAKE_CURRENT_BINARY_DIR}/init.lua
+	DESTINATION
+		${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}
 )