Fixed core_symbol.hpp issues

taokayan · Jul 30, 2018 · 3baaae4 · 3baaae4
1 parent 2c3fddb
commit 3baaae4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/libraries/eosiolib/CMakeLists.txt b/libraries/eosiolib/CMakeLists.txt
@@ -18,3 +18,4 @@ install(TARGETS eosio EXPORT EosioLib
    ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
 
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../eosiolib DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/core_symbol.hpp DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
diff --git a/libraries/eosiolib/core_symbol.hpp b/libraries/eosiolib/core_symbol.hpp
diff --git a/modules/EosioWasmToolchainBuild.cmake.in b/modules/EosioWasmToolchainBuild.cmake.in
@@ -8,8 +8,8 @@ set(CLANG_DIR @CMAKE_BINARY_DIR@/EosioClang-prefix/src/EosioClang-build)
 set(CMAKE_C_COMPILER "${CLANG_DIR}/bin/eosio-cc")
 set(CMAKE_CXX_COMPILER "${CLANG_DIR}/bin/eosio-cpp")
 
-set(CMAKE_C_FLAGS " -O3 -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include")
-set(CMAKE_CXX_FLAGS " -O3 -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include --std=c++14 ")
+set(CMAKE_C_FLAGS " -O3 -I@CMAKE_BINARY_DIR@/libraries/ -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include")
+set(CMAKE_CXX_FLAGS " -O3 -I@CMAKE_BINARY_DIR@/libraries/ -I@CMAKE_SOURCE_DIR@/libraries/boost/include -I@CMAKE_SOURCE_DIR@/libraries/libc++/libcxx/include -I@CMAKE_SOURCE_DIR@/libraries/libc/musl/include -I@CMAKE_SOURCE_DIR@/libraries -I@BOOST_ROOT@/include --std=c++14 ")
 
 set(WASM_LINKER "${CLANG_DIR}/bin/eosio-ld ")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ install(TARGETS eosio EXPORT EosioLib
		ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})

		install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../eosiolib DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})
		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/core_symbol.hpp DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR})