Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed pathes

This commit is contained in:
Frank Celler 2014-12-24 08:26:54 +01:00
parent 91dd0c80c1
commit c0377c7bde
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -418,8 +418,8 @@ endif ()
################################################################################ ################################################################################
if (BUILD_PACKAGE STREQUAL "raspbian") if (BUILD_PACKAGE STREQUAL "raspbian")
set(ARM_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty-ARM/include CACHE path "ARM 3rd party include path") set(ARM_INCLUDE ${PROJECT_SOURCE_DIR}/ArmLibraries/include CACHE path "ARM 3rd party include path")
set(ARM_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty-ARM/lib CACHE path "ARM 3rd party library path") set(ARM_LIB_PATH ${PROJECT_SOURCE_DIR}/ArmLibraries/lib CACHE path "ARM 3rd party library path")
endif () endif ()
if (ARM_INCLUDE) if (ARM_INCLUDE)
@ -441,8 +441,6 @@ if (MSVC)
add_definitions("-DU_STATIC_IMPLEMENTATION=1") add_definitions("-DU_STATIC_IMPLEMENTATION=1")
elseif (BUILD_PACKAGE STREQUAL "raspbian") elseif (BUILD_PACKAGE STREQUAL "raspbian")
set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/ArmLibraries/icu/include CACHE path "ICU include path")
set(ICU_LIB_PATH ${PROJECT_SOURCE_DIR}/ArmLibraries/icu/lib CACHE path "ICU library path")
set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries") set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries")
else () else ()
set(ICU_INCLUDE1 ${PROJECT_SOURCE_DIR}/3rdParty/V8/third_party/icu/source/common CACHE path "ICU include path") set(ICU_INCLUDE1 ${PROJECT_SOURCE_DIR}/3rdParty/V8/third_party/icu/source/common CACHE path "ICU include path")
@ -452,10 +450,6 @@ else ()
set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries") set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries")
endif () endif ()
if (ICU_INCLUDE)
include_directories(${ICU_INCLUDE})
endif ()
if (ICU_INCLUDE1) if (ICU_INCLUDE1)
include_directories(${ICU_INCLUDE1}) include_directories(${ICU_INCLUDE1})
endif () endif ()
@ -528,15 +522,12 @@ endif ()
if (MSVC) if (MSVC)
set(OPENSSL_LIBS ssleay;libeay CACHE string "OPENSSL libraries") set(OPENSSL_LIBS ssleay;libeay CACHE string "OPENSSL libraries")
set(OPENSSL_VERSION "OpenSSL 1.0.1e" CACHE string "OPENSSL version")
elseif (BUILD_PACKAGE STREQUAL "raspbian") elseif (BUILD_PACKAGE STREQUAL "raspbian")
set(OPENSSL_LIBS ssl;crypto CACHE string "OPENSSL libraries") set(OPENSSL_LIBS ssl;crypto CACHE string "OPENSSL libraries")
set(OPENSSL_VERSION "OpenSSL 0.9.8r 8 Feb 2011" CACHE string "OPENSSL version")
else () else ()
set(OPENSSL_INCLUDE "" CACHE path "OPENSSL include path") set(OPENSSL_INCLUDE "" CACHE path "OPENSSL include path")
set(OPENSSL_LIB_PATH "" CACHE path "OPENSSL library path") set(OPENSSL_LIB_PATH "" CACHE path "OPENSSL library path")
set(OPENSSL_LIBS ssl;crypto CACHE string "OPENSSL libraries") set(OPENSSL_LIBS ssl;crypto CACHE string "OPENSSL libraries")
set(OPENSSL_VERSION "OpenSSL 0.9.8r 8 Feb 2011" CACHE string "OPENSSL version")
endif () endif ()
if (OPENSSL_INCLUDE) if (OPENSSL_INCLUDE)
@ -547,8 +538,6 @@ if (OPENSSL_LIB_PATH)
link_directories(${OPENSSL_LIB_PATH}) link_directories(${OPENSSL_LIB_PATH})
endif () endif ()
add_definitions("-DTRI_OPENSSL_VERSION=\"${OPENSSL_VERSION}\"")
################################################################################ ################################################################################
### @brief READLINE or LINENOISE ### @brief READLINE or LINENOISE
################################################################################ ################################################################################

1
GNUmakefile
View File

@ -177,7 +177,6 @@ pack-arm:
--prefix=/usr \ --prefix=/usr \
--sysconfdir=/etc \ --sysconfdir=/etc \
--localstatedir=/var \ --localstatedir=/var \
--with-v8=./3rdParty-ARM \
--disable-mruby --disable-mruby
touch .libev-build-32 touch .libev-build-32