aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorJoão Valverde <joao.valverde@tecnico.ulisboa.pt>2017-12-10 17:29:40 +0000
committerJoão Valverde <j@v6e.pt>2017-12-11 02:52:28 +0000
commit5fc43fe63a07062587bc3d76256f4240221e8bc7 (patch)
tree8508ce04e5aec4e0e23ad958f9ec6a5102f93fc0 /cmake
parent224e24884a8b37732105bd40a0ee85d5feaaeab1 (diff)
Rewrite make-tap-reg.py in C
Change-Id: Ief5b1fffecc9712c01ff10292c403b7c84a5908a Reviewed-on: https://code.wireshark.org/review/24756 Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/UseMakeTapReg.cmake17
-rw-r--r--cmake/modules/UseMakeTaps.cmake15
2 files changed, 15 insertions, 17 deletions
diff --git a/cmake/modules/UseMakeTapReg.cmake b/cmake/modules/UseMakeTapReg.cmake
deleted file mode 100644
index 1242d844c1..0000000000
--- a/cmake/modules/UseMakeTapReg.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-MACRO(REGISTER_TAP_FILES _outputfile _registertype )
- set( _sources ${ARGN})
- ADD_CUSTOM_COMMAND(
- OUTPUT
- ${_outputfile}
- COMMAND ${PYTHON_EXECUTABLE}
- ${CMAKE_SOURCE_DIR}/tools/make-tap-reg.py
- "${CMAKE_CURRENT_SOURCE_DIR}"
- ${_registertype}
- ${_sources}
- DEPENDS
- ${CMAKE_SOURCE_DIR}/tools/make-tap-reg.py
- ${_sources}
-)
-ENDMACRO(REGISTER_TAP_FILES)
-
diff --git a/cmake/modules/UseMakeTaps.cmake b/cmake/modules/UseMakeTaps.cmake
new file mode 100644
index 0000000000..18efdfc9e1
--- /dev/null
+++ b/cmake/modules/UseMakeTaps.cmake
@@ -0,0 +1,15 @@
+#
+MACRO(REGISTER_TAP_FILES _outputfile)
+ set(_sources ${ARGN})
+ ADD_CUSTOM_COMMAND(
+ OUTPUT
+ ${_outputfile}
+ COMMAND
+ make-taps ${_outputfile} ${_sources}
+ DEPENDS
+ make-taps
+ ${_sources}
+ COMMENT
+ "Making ${_outputfile}"
+)
+ENDMACRO(REGISTER_TAP_FILES)