[Thirdparty] Refine cmake files to fix compiling error after cleaning…

… with clang++.
geekhuyang · Feb 18, 2020 · f87f6ec · f87f6ec
1 parent 6621048
commit f87f6ec
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 27 deletions.
diff --git a/test/evmc/CMakeLists.txt b/test/evmc/CMakeLists.txt
@@ -7,7 +7,7 @@ add_executable(ssvmEVMCTests
 
 target_link_libraries(ssvmEVMCTests
   PRIVATE
-  utilEVMC
+  utilEVMCLoader
   utilGoogleTest
   ssvmVM
   ${CMAKE_DL_LIBS}

diff --git a/thirdparty/evmc/CMakeLists.txt b/thirdparty/evmc/CMakeLists.txt
@@ -1,3 +1 @@
-add_library(utilEVMC
-  lib/loader/loader.c
-)
+add_subdirectory(lib)
diff --git a/thirdparty/evmc/lib/instructions/CMakeLists.txt b/thirdparty/evmc/lib/instructions/CMakeLists.txt
@@ -3,16 +3,7 @@
 # Licensed under the Apache License, Version 2.0.
 
 add_library(
-    instructions STATIC
-    ${include_dir}/evmc/instructions.h
+    utilEVMCInstructions STATIC
     instruction_metrics.c
     instruction_names.c
 )
-
-add_library(evmc::instructions ALIAS instructions)
-set_target_properties(instructions PROPERTIES OUTPUT_NAME evmc-instructions)
-target_include_directories(instructions PUBLIC $<BUILD_INTERFACE:${include_dir}>$<INSTALL_INTERFACE:include>)
-
-if(EVMC_INSTALL)
-    install(TARGETS instructions EXPORT evmcTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif()
diff --git a/thirdparty/evmc/lib/loader/CMakeLists.txt b/thirdparty/evmc/lib/loader/CMakeLists.txt
@@ -3,21 +3,11 @@
 # Licensed under the Apache License, Version 2.0.
 
 add_library(
-    loader STATIC
-    ${include_dir}/evmc/loader.h
+    utilEVMCLoader STATIC
     loader.c
 )
 
-add_library(evmc::loader ALIAS loader)
-set_target_properties(loader PROPERTIES
-    OUTPUT_NAME evmc-loader
+set_target_properties(utilEVMCLoader PROPERTIES
     POSITION_INDEPENDENT_CODE TRUE
 )
-target_include_directories(loader PUBLIC
-    $<BUILD_INTERFACE:${include_dir}>$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-target_link_libraries(loader INTERFACE ${CMAKE_DL_LIBS})
-
-if(EVMC_INSTALL)
-    install(TARGETS loader EXPORT evmcTargets DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif()
+target_link_libraries(utilEVMCLoader INTERFACE ${CMAKE_DL_LIBS})