examples: Move example_vm into the examples/example_vm subdirectory

ethereum · Jul 23, 2019 · be56b09 · be56b09
1 parent b8ae6d2
commit be56b09
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 24 deletions.
diff --git a/Doxyfile b/Doxyfile
@@ -102,7 +102,7 @@ WARN_LOGFILE           =
 INPUT                  = \
     include/evmc/ \
     docs/ \
-    examples/example_vm.c
+    examples/example_vm/example_vm.c
 INPUT_ENCODING         = UTF-8
 FILE_PATTERNS          =
 RECURSIVE              = NO

diff --git a/bindings/go/evmc/evmc_test.go b/bindings/go/evmc/evmc_test.go
@@ -2,7 +2,7 @@
 // Copyright 2018-2019 The EVMC Authors.
 // Licensed under the Apache License, Version 2.0.
 
-//go:generate gcc -shared ../../../examples/example_vm.c -I../../../include -o example_vm.so
+//go:generate gcc -shared ../../../examples/example_vm/example_vm.c -I../../../include -o example_vm.so
 
 package evmc
 

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -10,29 +10,11 @@ if(NOT CMAKE_CXX_STANDARD)
 endif()
 set(CMAKE_DEBUG_POSTFIX "")
 
+add_subdirectory(example_vm)
 add_subdirectory(example_precompiles_vm)
 
-
 add_library(evmc-example-host STATIC example_host.cpp)
 target_link_libraries(evmc-example-host PRIVATE evmc)
 
-
-add_library(evmc-example-vm SHARED example_vm.c)
-target_link_libraries(evmc-example-vm PRIVATE evmc)
-
-add_library(evmc-example-vm-static STATIC example_vm.c)
-target_link_libraries(evmc-example-vm-static PRIVATE evmc)
-
-set_source_files_properties(example_vm.c PROPERTIES COMPILE_DEFINITIONS PROJECT_VERSION="${PROJECT_VERSION}")
-
-
 add_executable(evmc-example example.c)
-target_link_libraries(evmc-example PRIVATE evmc-example-host evmc-example-vm evmc)
-
-if(EVMC_INSTALL)
-    install(TARGETS evmc-example-vm
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    )
-endif()
+target_link_libraries(evmc-example PRIVATE evmc-example-host evmc-example-vm-static evmc)
diff --git a/examples/example.c b/examples/example.c
@@ -4,7 +4,7 @@
  */
 
 #include "example_host.h"
-#include "example_vm.h"
+#include "example_vm/example_vm.h"
 
 #include <evmc/helpers.h>
 

diff --git a/examples/example_vm/CMakeLists.txt b/examples/example_vm/CMakeLists.txt
@@ -0,0 +1,20 @@
+# EVMC: Ethereum Client-VM Connector API.
+# Copyright 2019 The EVMC Authors.
+# Licensed under the Apache License, Version 2.0.
+
+add_library(evmc-example-vm SHARED example_vm.c)
+target_link_libraries(evmc-example-vm PRIVATE evmc)
+
+add_library(evmc-example-vm-static STATIC example_vm.c)
+target_link_libraries(evmc-example-vm-static PRIVATE evmc)
+
+set_source_files_properties(example_vm.cpp PROPERTIES
+    COMPILE_DEFINITIONS PROJECT_VERSION="${PROJECT_VERSION}")
+
+if(EVMC_INSTALL)
+    install(TARGETS evmc-example-vm
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    )
+endif()
diff --git a/examples/example_vm.c → examples/example_vm/example_vm.c b/examples/example_vm.c → examples/example_vm/example_vm.c
diff --git a/examples/example_vm.h → examples/example_vm/example_vm.h b/examples/example_vm.h → examples/example_vm/example_vm.h
diff --git a/test/unittests/test_cpp.cpp b/test/unittests/test_cpp.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "../../examples/example_host.h"
-#include "../../examples/example_vm.h"
+#include "../../examples/example_vm/example_vm.h"
 
 #include <evmc/evmc.hpp>
 #include <evmc/helpers.hpp>