Skip to content
Snippets Groups Projects
Commit 504da83a authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Add check for readline library

parent c967aca1
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,20 @@ find_package( URIParser REQUIRED ) ...@@ -19,6 +19,20 @@ find_package( URIParser REQUIRED )
find_package( MsgPack REQUIRED ) find_package( MsgPack REQUIRED )
find_package( LibSGM ) find_package( LibSGM )
if (NOT WIN32)
find_library( READLINE_LIBRARY NAMES readline libreadline )
if (NOT READLINE_LIBRARY)
message(FATAL "Readline library missing")
else()
message(STATUS "Found Readline: ${READLINE_LIBRARY}")
endif()
endif()
find_program( NODE_NPM NAMES npm )
if (NODE_NPM)
message(STATUS "Found NPM: ${NODE_NPM}")
endif()
# Why is this problematic on some machines? # Why is this problematic on some machines?
check_language(CUDA) check_language(CUDA)
if (CUDA_TOOLKIT_ROOT_DIR) if (CUDA_TOOLKIT_ROOT_DIR)
...@@ -77,7 +91,7 @@ if (WIN32) ...@@ -77,7 +91,7 @@ if (WIN32)
set(FTL_LOCAL_DATA_ROOT "\"$ENV{USERPROFILE}/AppData/ftl\"") set(FTL_LOCAL_DATA_ROOT "\"$ENV{USERPROFILE}/AppData/ftl\"")
add_definitions(-DWIN32) add_definitions(-DWIN32)
set(CMAKE_CXX_FLAGS "/std:c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17")
set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -Wall") set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -Wall")
set(CMAKE_CXX_FLAGS_RELEASE "/O2") set(CMAKE_CXX_FLAGS_RELEASE "/O2")
endif (WIN32) endif (WIN32)
...@@ -95,14 +109,14 @@ if (UNIX) ...@@ -95,14 +109,14 @@ if (UNIX)
set(FTL_GLOBAL_CACHE_ROOT "\"${CMAKE_INSTALL_PREFIX}/share/ftl\"") set(FTL_GLOBAL_CACHE_ROOT "\"${CMAKE_INSTALL_PREFIX}/share/ftl\"")
set(FTL_GLOBAL_DATA_ROOT "\"${CMAKE_INSTALL_PREFIX}/share/ftl\"") set(FTL_GLOBAL_DATA_ROOT "\"${CMAKE_INSTALL_PREFIX}/share/ftl\"")
set(CMAKE_CXX_FLAGS "-std=c++17") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
set(CMAKE_CXX_FLAGS_DEBUG "-D_DEBUG -pg -Wall") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -pg -Wall")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse3 -mfpmath=sse") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -msse3 -mfpmath=sse")
endif (UNIX) endif (UNIX)
SET(CMAKE_USE_RELATIVE_PATHS ON) SET(CMAKE_USE_RELATIVE_PATHS ON)
add_subdirectory(net/cpp) add_subdirectory(net)
add_subdirectory(cv-node) add_subdirectory(cv-node)
configure_file(${CMAKE_SOURCE_DIR}/common/cpp/include/ftl/config.h.in configure_file(${CMAKE_SOURCE_DIR}/common/cpp/include/ftl/config.h.in
......
...@@ -9,4 +9,5 @@ Multiple protocols are supported, and it is intended that NAT traversal will be ...@@ -9,4 +9,5 @@ Multiple protocols are supported, and it is intended that NAT traversal will be
included. However, security, whether encryption or identification, is not included. However, security, whether encryption or identification, is not
considered presently. considered presently.
There are two supported languages: C++ and Javascript. See each respective
language folder for more details.
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"struct": "0.0.12", "struct": "0.0.12",
"uri-js": "^4.2.2" "uri-js": "^4.2.2",
"ws": "^6.2.1"
}, },
"devDependencies": { "devDependencies": {
"mocha": "^6.0.2" "mocha": "^6.0.2"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment