From b8ab4a0d5d71a293a35a68d615708f86e0a99445 Mon Sep 17 00:00:00 2001 From: Marek Kotewicz Date: Thu, 30 Apr 2015 12:40:35 +0200 Subject: [PATCH] making everything work with new eth_add_resources --- libjsconsole/CMakeLists.txt | 6 +++--- libjsengine/CMakeLists.txt | 6 +++--- libjsengine/JSResources.cmake | 1 - libjsengine/JSV8Printer.cpp | 1 + 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libjsconsole/CMakeLists.txt b/libjsconsole/CMakeLists.txt index 984874921..7fa3c5057 100644 --- a/libjsconsole/CMakeLists.txt +++ b/libjsconsole/CMakeLists.txt @@ -18,10 +18,10 @@ set(EXECUTABLE jsconsole) file(GLOB HEADERS "*.h") -add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) - include(EthUtils) -eth_add_resources(${EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake") +eth_add_resources("${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake" JSRES) + +add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS} ${JSRES}) target_link_libraries(${EXECUTABLE} jsengine) target_link_libraries(${EXECUTABLE} devcore) diff --git a/libjsengine/CMakeLists.txt b/libjsengine/CMakeLists.txt index eb90bff61..d16d1b102 100644 --- a/libjsengine/CMakeLists.txt +++ b/libjsengine/CMakeLists.txt @@ -17,10 +17,10 @@ set(EXECUTABLE jsengine) file(GLOB HEADERS "*.h") -add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS}) - include(EthUtils) -eth_add_resources(${EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake") +eth_add_resources("${CMAKE_CURRENT_SOURCE_DIR}/JSResources.cmake" "JSRES") +message(STATUS "HERE!!! ${JSRES}") +add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS} ${JSRES}) # macos brew version of v8 needs to be compiled with libstdc++ # it also needs to be dynamic library diff --git a/libjsengine/JSResources.cmake b/libjsengine/JSResources.cmake index 442bbcf6b..b0b5d0c1e 100644 --- a/libjsengine/JSResources.cmake +++ b/libjsengine/JSResources.cmake @@ -4,4 +4,3 @@ set(pretty_print "${CMAKE_CURRENT_LIST_DIR}/PrettyPrint.js") set(ETH_RESOURCE_NAME "JSEngineResources") set(ETH_RESOURCE_LOCATION "${CMAKE_CURRENT_BINARY_DIR}") set(ETH_RESOURCES "pretty_print") - diff --git a/libjsengine/JSV8Printer.cpp b/libjsengine/JSV8Printer.cpp index 9b1536fba..87a53b6da 100644 --- a/libjsengine/JSV8Printer.cpp +++ b/libjsengine/JSV8Printer.cpp @@ -5,6 +5,7 @@ #include #include "JSV8Printer.h" #include "libjsengine/JSEngineResources.hpp" +#include "libjsengine/t.h" using namespace std; using namespace dev;