CMake: Flatten examplevm

ethereum · Aug 30, 2018 · d697018 · d697018
1 parent 79048b6
commit d697018
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 24 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -2,16 +2,30 @@
 # Copyright 2018 The EVMC Authors.
 # Licensed under the Apache License, Version 2.0. See the LICENSE file.
 
+include(GNUInstallDirs)
+
 if(NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
     set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
 set(CMAKE_DEBUG_POSTFIX "")
 
+
 add_library(evmc-example-host STATIC example_host.cpp)
 target_link_libraries(evmc-example-host PRIVATE evmc)
 
-add_subdirectory(examplevm)
+
+add_library(evmc-examplevm examplevm.c)
+target_link_libraries(evmc-examplevm PRIVATE evmc)
+set_source_files_properties(examplevm.c PROPERTIES COMPILE_DEFINITIONS PROJECT_VERSION=${PROJECT_VERSION})
+
 
 add_executable(evmc-example example.c)
 target_link_libraries(evmc-example PRIVATE evmc-example-host evmc-examplevm evmc)
+
+
+install(TARGETS evmc-examplevm
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/examples/example.c b/examples/example.c
@@ -4,7 +4,7 @@
  */
 
 #include "example_host.h"
-#include "examplevm/examplevm.h"
+#include "examplevm.h"
 
 #include <evmc/helpers.h>
 

diff --git a/examples/examplevm/examplevm.c → examples/examplevm.c b/examples/examplevm/examplevm.c → examples/examplevm.c
diff --git a/examples/examplevm/examplevm.h → examples/examplevm.h b/examples/examplevm/examplevm.h → examples/examplevm.h
diff --git a/examples/examplevm/CMakeLists.txt b/examples/examplevm/CMakeLists.txt