3 files changed, 54 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 42e3a1cbf74..2a3296897c7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -69,7 +69,7 @@ include(cmake/deb.cmake)
 foreach(
   DIR
   vppinfra svm vlib vlibmemory vlibapi vnet vpp vat vcl plugins
-  vpp-api tools/vppapigen
+  vpp-api tools/vppapigen tools/g2 tools/elftool
 )
   add_subdirectory(${DIR})
 endforeach()
diff --git a/src/tools/elftool/CMakeLists.txt b/src/tools/elftool/CMakeLists.txt
new file mode 100644
index 00000000000..d85c2b56c59
--- /dev/null
+++ b/src/tools/elftool/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Copyright (c) 2018 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+add_vpp_executable(elftool
+  SOURCES elftool.c
+  LINK_LIBRARIES vppinfra
+)
diff --git a/src/tools/g2/CMakeLists.txt b/src/tools/g2/CMakeLists.txt
new file mode 100644
index 00000000000..36dd6e9e625
--- /dev/null
+++ b/src/tools/g2/CMakeLists.txt
@@ -0,0 +1,36 @@
+# Copyright (c) 2018 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+option(VPP_BUILD_G2 "Build g2 tool." OFF)
+if(VPP_BUILD_G2)
+  find_package(GTK2 COMPONENTS gtk)
+  if(GTK2_FOUND)
+    include_directories(${GTK2_INCLUDE_DIRS})
+    add_vpp_executable(g2
+      SOURCES
+      clib.c
+      cpel.c
+      events.c
+      main.c
+      menu1.c
+      pointsel.c
+      props.c
+      g2version.c
+      view1.c
+
+      LINK_LIBRARIES vppinfra Threads::Threads m ${GTK2_LIBRARIES}
+      NO_INSTALL
+    )
+  endif()
+endif()
+