Skip to content

Commit

Permalink
bump version, update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
corymickelson committed Nov 8, 2018
1 parent 79584e0 commit 57880f7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
10 changes: 2 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_FLAGS_DEBUG "-g")
set(CMAKE_CXX_FLAGS_RELEASE "-O3")
set(NAPI_CPP_EXCEPTIONS "yes")
set(CMAKE_CXX_FLAGS -fPIC)
set(CMAKE_EXPORT_COMPILE_COMMANDS "yes")
set(CMAKE_CXX_FLAGS "-fPIC")
set(CMAKE_SHARED_LINKER_FLAGS "-Wl,-rpath=/var/task/node_modules/norc-aws/lib")
Expand All @@ -24,17 +23,12 @@ set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
if (NOT PROJECT_DIR)
message(WARNING "Project dir not explicity set using cmake source directory: ${CMAKE_SOURCE_DIR}")
set(NAPI_MODULE "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api")
set(NAPI_SRC "${CMAKE_SOURCE_DIR}/node_modules/node-addon-api/src")
else()
set(NAPI_MODULE "${PROJECT_DIR}/node_modules/node-addon-api")
set(NAPI_SRC "${PROJECT_DIR}/node_modules/node-addon-api/src")
endif()
message(WARNING "Using napi: ${NAPI_MODULE}")
target_include_directories(${PROJECT_NAME} PRIVATE
${NAPI_MODULE}
${NAPI_MODULE}/include
${NAPI_SRC}
${CMAKE_JS_INC} )
${CMAKE_JS_INC}
${NAPI_MODULE})
target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB} stdc++fs)
find_package(Threads REQUIRED)

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@npilots/norc",
"version": "0.4.1",
"version": "0.5.0",
"description": "Nodejs ORC file reader/writer",
"main": "index.js",
"types": "index.d.ts",
Expand Down Expand Up @@ -30,7 +30,7 @@
"alsatian": "^2.3.0",
"cmake-js": "^3.7.3",
"fast-csv": "^2.4.1",
"node-addon-api": "1.5.0",
"node-addon-api": "1.6.0",
"tap-bark": "^1.0.0"
},
"files": [
Expand Down

0 comments on commit 57880f7

Please sign in to comment.