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

attempt to fix failing Windows build

This commit is contained in:
Jan Steemann 2015-10-22 18:03:07 +02:00
parent e6121b4464
commit 03da10bb51
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@ -695,25 +695,23 @@ endif ()
################################################################################ ################################################################################
if (MSVC) if (MSVC)
set(READLINE_LIBS linenoise CACHE string "LINENOISE libraries") set(LINENOISE_LIBS linenoise CACHE string "LINENOISE libraries")
set(READLINE_VERSION "linenoise" CACHE string "LINENOISE version") set(LINENOISE_VERSION "linenoise" CACHE string "LINENOISE version")
else () else ()
set(READLINE_INCLUDE "" CACHE path "READLINE include path") set(LINENOISE_INCLUDE "" CACHE path "LINENOISE include path")
set(READLINE_LIB_PATH "" CACHE path "READLINE library path") set(LINENOISE_LIB_PATH "" CACHE path "LINENOISE library path")
set(READLINE_LIBS readline CACHE string "READLINE libraries") set(LINENOISE_LIBS readline CACHE string "LINENOISE libraries")
set(READLINE_VERSION "unknown" CACHE string "READLINE version") set(LINENOISE_VERSION "unknown" CACHE string "LINENOISE version")
endif () endif ()
if (READLINE_INCLUDE) if (LINENOISE_INCLUDE)
include_directories(${READLINE_INCLUDE}) include_directories(${LINENOISE_INCLUDE})
endif () endif ()
if (READLINE_LIB_PATH) if (LINENOISE_LIB_PATH)
link_directories(${READLINE_LIB_PATH}) link_directories(${LINENOISE_LIB_PATH})
endif () endif ()
add_definitions("-DTRI_READLINE_VERSION=\"${READLINE_VERSION}\"")
################################################################################ ################################################################################
### @brief V8 ### @brief V8
################################################################################ ################################################################################

1
arangod/CMakeLists.txt
View File

@ -279,6 +279,7 @@ target_link_libraries(
${ICU_LIBS} ${ICU_LIBS}
${BT_LIBS} ${BT_LIBS}
${ZLIB_LIBS} ${ZLIB_LIBS}
${LINENOISE_LIBS}
${OPENSSL_LIBS} ${OPENSSL_LIBS}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${MSVC_LIBS} ${MSVC_LIBS}

5
arangosh/CMakeLists.txt
View File

@ -48,6 +48,7 @@ target_link_libraries(
${ICU_LIBS} ${ICU_LIBS}
${BT_LIBS} ${BT_LIBS}
${ZLIB_LIBS} ${ZLIB_LIBS}
${LINENOISE_LIBS}
${OPENSSL_LIBS} ${OPENSSL_LIBS}
${MSVC_LIBS} ${MSVC_LIBS}
) )
@ -97,6 +98,7 @@ target_link_libraries(
${ICU_LIBS} ${ICU_LIBS}
${BT_LIBS} ${BT_LIBS}
${ZLIB_LIBS} ${ZLIB_LIBS}
${LINENOISE_LIBS}
${OPENSSL_LIBS} ${OPENSSL_LIBS}
${MSVC_LIBS} ${MSVC_LIBS}
) )
@ -147,6 +149,7 @@ target_link_libraries(
${ICU_LIBS} ${ICU_LIBS}
${BT_LIBS} ${BT_LIBS}
${ZLIB_LIBS} ${ZLIB_LIBS}
${LINENOISE_LIBS}
${OPENSSL_LIBS} ${OPENSSL_LIBS}
${MSVC_LIBS} ${MSVC_LIBS}
) )
@ -195,6 +198,7 @@ target_link_libraries(
${ICU_LIBS} ${ICU_LIBS}
${BT_LIBS} ${BT_LIBS}
${ZLIB_LIBS} ${ZLIB_LIBS}
${LINENOISE_LIBS}
${OPENSSL_LIBS} ${OPENSSL_LIBS}
${MSVC_LIBS} ${MSVC_LIBS}
) )
@ -247,6 +251,7 @@ target_link_libraries(
${BT_LIBS} ${BT_LIBS}
${ICU_LIBS} ${ICU_LIBS}
${ZLIB_LIBS} ${ZLIB_LIBS}
${LINENOISE_LIBS}
${OPENSSL_LIBS} ${OPENSSL_LIBS}
${MSVC_LIBS} ${MSVC_LIBS}
) )