Skip to content

Commit

Permalink
Updated for the new OpenVEIL 7.0.32
Browse files Browse the repository at this point in the history
  • Loading branch information
answerman1000 committed May 23, 2016
1 parent e75e7b5 commit 63c38bd
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 20 deletions.
24 changes: 12 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ project (OpenVEILnodeJS C CXX)

IF(WIN32)
if(MSVC_IDE)
set(TS_INSTALL_PREFIX "c:/TecSec/OpenVEIL_7-0")
set(TS_INSTALL_PREFIX "c:/TecSec/VEIL_7-0")
else(MSVC_IDE)
set(TS_INSTALL_PREFIX "c:/TecSec/OpenVEIL_7-0")
set(TS_INSTALL_PREFIX "c:/TecSec/VEIL_7-0")
endif(MSVC_IDE)
set(TS_INSTALL_PREFIX_DEBUG "c:/TecSec/OpenVEIL_7-0")
set(TS_INSTALL_PREFIX_RELEASE "c:/TecSec/OpenVEIL_7-0")
set(TS_INSTALL_PREFIX_DEBUG "c:/TecSec/VEIL_7-0")
set(TS_INSTALL_PREFIX_RELEASE "c:/TecSec/VEIL_7-0")
ELSE(WIN32)
SET(TS_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../local" CACHE STRING "The install path to use for Linux")
ENDIF(WIN32)
Expand All @@ -30,7 +30,7 @@ set(TS_INSTALL_PREFIX ${TS_INSTALL_PREFIX}/${TS_TOOLSET})
include (tecsec_installdirs)

include(summary)
include(${ALLBIN_DIR}/OpenVEILVersion.cmake)
include(${ALLBIN_DIR}/VEILApiVersion.cmake)
set(CMAKE_DEBUG_POSTFIX "")

message(STATUS "ALLBIN_DIR = ${ALLBIN_DIR}")
Expand All @@ -41,9 +41,9 @@ message(STATUS "OPENVEIL_INSTALL_LIB_DIR = ${OPENVEIL_INSTALL_LIB_DIR}")
message(STATUS "OPENVEIL_INSTALL_SHLIB_DIR = ${OPENVEIL_INSTALL_SHLIB_DIR}")


ImportTarget(OpenVEILCore)
ImportTarget(CmsHeader)
ImportTarget(FileVEILSupport)
ImportTarget(VEILCore)
ImportTarget(VEILCmsHeader)
ImportTarget(VEILFileSupport)

set(CMAKE_BUILD_TYPE ${TS_VS_CONFIG} CACHE STRING "The configuration build type")
if (CMAKE_CONFIGURATION_TYPES)
Expand All @@ -59,13 +59,13 @@ add_uninstall()

add_library(OpenVEIL SHARED "src/KeyVEILConnector.cpp" "src/KeyVEILConnector.h" "src/GenericConnector.cpp" "src/GenericConnector.h" "src/Favorite.cpp" "src/Favorite.h" "src/Session.cpp" "src/Session.h" "src/Token.cpp" "src/Token.h" "src/addon.cc")
set_target_properties(OpenVEIL PROPERTIES PREFIX "" SUFFIX ".node")
target_link_libraries(OpenVEIL ${CMAKE_JS_LIB} OpenVEILCore CmsHeader FileVEILSupport)
target_link_libraries(OpenVEIL ${CMAKE_JS_LIB} VEILCore VEILCmsHeader VEILFileSupport)

summary()

CopyImportTargetBinaries(OpenVEILCore ${BIN_DIR})
CopyImportTargetBinaries(CmsHeader ${BIN_DIR})
CopyImportTargetBinaries(FileVEILSupport ${BIN_DIR})
CopyImportTargetBinaries(VEILCore ${BIN_DIR})
CopyImportTargetBinaries(VEILCmsHeader ${BIN_DIR})
CopyImportTargetBinaries(VEILFileSupport ${BIN_DIR})

install(TARGETS OpenVEIL ARCHIVE DESTINATION ${LIB_DIR} LIBRARY DESTINATION ${SHLIB_DIR} RUNTIME DESTINATION ${BIN_DIR} )
install(FILES Samples/tokenList.js DESTINATION ${BIN_DIR}/Samples)
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"bindings": "~1.2.1",
"cmake-js": "^3.1.2",
"nan": "^2.2.0"
"nan": "^2.3.3"
},
"scripts": {
"install": "cmake-js compile"
Expand Down
6 changes: 3 additions & 3 deletions src/Favorite.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
#ifndef __FAVORITE_H__
#define __FAVORITE_H__

#include "OpenVEIL.h"
#include "CmsHeader.h"
#include "FileVEILSupport.h"
#include "VEIL.h"
#include "VEILCmsHeader.h"
#include "VEILFileSupport.h"
#include <nan.h>

class Session;
Expand Down
2 changes: 1 addition & 1 deletion src/GenericConnector.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef __GENERICCONNECTOR_H__
#define __GENERICCONNECTOR_H__

#include "OpenVEIL.h"
#include "VEIL.h"
#include <nan.h>

class GenericConnector : public Nan::ObjectWrap
Expand Down
2 changes: 1 addition & 1 deletion src/KeyVEILConnector.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef __KEYVEILCONNECTOR_H__
#define __KEYVEILCONNECTOR_H__

#include "OpenVEIL.h"
#include "VEIL.h"
#include <nan.h>

class Token;
Expand Down
2 changes: 1 addition & 1 deletion src/Session.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef __SESSION_H__
#define __SESSION_H__

#include "OpenVEIL.h"
#include "VEIL.h"
#include <nan.h>
#include "Favorite.h"

Expand Down
2 changes: 1 addition & 1 deletion src/Token.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#ifndef __TOKEN_H__
#define __TOKEN_H__

#include "OpenVEIL.h"
#include "VEIL.h"
#include <nan.h>

class Token : public Nan::ObjectWrap
Expand Down

0 comments on commit 63c38bd

Please sign in to comment.