Fix cmake

NilFoundation · Jun 18, 2024 · 04ad40f · 04ad40f
1 parent 0b66c51
commit 04ad40f
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -110,15 +110,10 @@ endif()
 
 include(CTest)
 
-set(include_dir ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
 add_subdirectory(lib)
 
 # INSTALL
 
-install(DIRECTORY ${include_dir}/
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
 set(CONFIG_PATH ${CMAKE_INSTALL_LIBDIR}/cmake/evm-assigner)
 set(TARGET_NAMESPACE evm-assigner::)
 install(EXPORT assignerTargets NAMESPACE ${TARGET_NAMESPACE} DESTINATION ${CONFIG_PATH})

diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
@@ -7,5 +7,4 @@ find_dependency(evmc REQUIRED)
 find_dependency(intx REQUIRED)
 find_dependency(ethash REQUIRED)
 
-include("${CMAKE_CURRENT_LIST_DIR}/evmoneTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/assignerTargets.cmake")
diff --git a/lib/assigner/CMakeLists.txt b/lib/assigner/CMakeLists.txt
@@ -20,7 +20,6 @@ find_package(blueprint_crypto3 REQUIRED)
 
 target_include_directories(${PROJECT_NAME} PUBLIC
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-                           $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
                            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
                            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/evmone>)
 

diff --git a/lib/assigner/evmone/execution_state.hpp b/lib/assigner/evmone/execution_state.hpp
@@ -199,7 +199,7 @@ class ExecutionState
 
     const evmc_tx_context& get_tx_context() noexcept
     {
-        if (bool(m_tx.block_timestamp == 0))
+        if (m_tx.block_timestamp == 0)
             m_tx = host.get_tx_context();
         return m_tx;
     }