From b7d8f9851f46662ed1109b4c09ac484c74defd16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Thu, 5 Mar 2015 18:29:11 +0100 Subject: [PATCH] Update cmake scripts, use static list of source files --- libevmjit-cpp/CMakeLists.txt | 3 ++- libevmjit/CMakeLists.txt | 33 +++++++++++++++++++++++++-------- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/libevmjit-cpp/CMakeLists.txt b/libevmjit-cpp/CMakeLists.txt index 53448332b..add132f2a 100644 --- a/libevmjit-cpp/CMakeLists.txt +++ b/libevmjit-cpp/CMakeLists.txt @@ -4,8 +4,9 @@ set(TARGET_NAME evmjit-cpp) find_package(Boost REQUIRED) set(SOURCES - Env.cpp + Env.cpp JitVM.cpp JitVM.h + Utils.h ) source_group("" FILES ${SOURCES}) diff --git a/libevmjit/CMakeLists.txt b/libevmjit/CMakeLists.txt index d72c58009..7f4e763d7 100644 --- a/libevmjit/CMakeLists.txt +++ b/libevmjit/CMakeLists.txt @@ -1,9 +1,29 @@ set(TARGET_NAME evmjit) -file(GLOB SOURCES "*.cpp") -file(GLOB HEADERS "*.h") -set(INTERFACE_HEADERS interface.h) -source_group("" FILES ${HEADERS}) +set(SOURCES + Arith256.cpp Arith256.h + Array.cpp Array.h + BasicBlock.cpp BasicBlock.h + Cache.cpp Cache.h + Common.h + Compiler.cpp Compiler.h + CompilerHelper.cpp CompilerHelper.h + Endianness.cpp Endianness.h + ExecStats.cpp ExecStats.h + ExecutionEngine.cpp ExecutionEngine.h + Ext.cpp Ext.h + GasMeter.cpp GasMeter.h + Instruction.cpp Instruction.h + interface.cpp interface.h + Memory.cpp Memory.h + Optimizer.cpp Optimizer.h + Runtime.cpp Runtime.h + RuntimeData.h + RuntimeManager.cpp RuntimeManager.h + Stack.cpp Stack.h + Type.cpp Type.h + Utils.cpp Utils.h +) source_group("" FILES ${SOURCES}) if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC") @@ -54,7 +74,7 @@ configure_file(BuildInfo.h.in ${CMAKE_CURRENT_BINARY_DIR}/gen/BuildInfo.gen.h) message(STATUS "EVM JIT version: ${EVMJIT_VERSION_MAJOR}.${EVMJIT_VERSION_MINOR}.${EVMJIT_VERSION_PATCH} ${EVMJIT_VERSION_PRERELEASE} (${EVMJIT_VERSION_FULL})") -add_library(${TARGET_NAME} SHARED ${SOURCES} ${HEADERS} gen/BuildInfo.gen.h) +add_library(${TARGET_NAME} SHARED ${SOURCES} gen/BuildInfo.gen.h) set_target_properties(${TARGET_NAME} PROPERTIES VERSION ${EVMJIT_VERSION} SOVERSION ${EVMJIT_SOVERSION} FOLDER "libs") @@ -64,7 +84,4 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}/gen) target_link_libraries(${TARGET_NAME} PRIVATE ${LLVM_LIBS}) -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") - install(TARGETS ${TARGET_NAME} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin) -#install(FILES ${INTERFACE_HEADERS} DESTINATION include/${TARGET_NAME}) \ No newline at end of file