diff options
| author | Přemysl Janouch <p.janouch@gmail.com> | 2015-02-22 20:27:31 +0100 |
|---|---|---|
| committer | Přemysl Janouch <p.janouch@gmail.com> | 2015-02-22 20:27:31 +0100 |
| commit | fc197b12cff286f0eb29ad4b1070728f47c62392 (patch) | |
| tree | 86f32ecb949ecc488cce6debe35e9619cd41c68a | |
| parent | 855d02acab5a2f679a736fcaa0b88de068b0922b (diff) | |
| download | json-rpc-shell-fc197b12cff286f0eb29ad4b1070728f47c62392.tar.gz json-rpc-shell-fc197b12cff286f0eb29ad4b1070728f47c62392.tar.xz json-rpc-shell-fc197b12cff286f0eb29ad4b1070728f47c62392.zip | |
Also build with ncursesw only
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 20 |
2 files changed, 16 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 620992f..e60d0b2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: - sudo add-apt-repository ppa:ukplc-team/ppa -y - sudo apt-get update -qq install: - - sudo apt-get install -y libcurl4-openssl-dev libjansson-dev libev-dev libreadline-dev + - sudo apt-get install -y libcurl4-openssl-dev libjansson-dev libev-dev libreadline-dev libncursesw5-dev before_script: - mkdir build - cd build diff --git a/CMakeLists.txt b/CMakeLists.txt index 560ebda..adfb404 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,13 +20,24 @@ set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}") set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # Dependencies -find_package (Curses REQUIRED) +find_package (Curses) find_package (PkgConfig REQUIRED) pkg_check_modules (dependencies REQUIRED libcurl jansson) find_package (LibEV REQUIRED) +pkg_check_modules (ncursesw ncursesw) -include_directories (${CURSES_INCLUDE_DIR} - ${dependencies_INCLUDE_DIRS} ${LIBEV_INCLUDE_DIRS}) +set (project_libraries ${dependencies_LIBRARIES} ${LIBEV_LIBRARIES} readline) +include_directories (${dependencies_INCLUDE_DIRS} ${LIBEV_INCLUDE_DIRS}) + +if (ncursesw_FOUND) + list (APPEND project_libraries ${ncursesw_LIBRARIES}) + include_directories (${ncursesw_INCLUDE_DIRS}) +elseif (CURSES_FOUND) + list (APPEND project_libraries ${CURSES_LIBRARY}) + include_directories (${CURSES_INCLUDE_DIR}) +else (CURSES_FOUND) + message (SEND_ERROR "Curses not found") +endif (ncursesw_FOUND) # Generate a configuration file configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h) @@ -34,8 +45,7 @@ include_directories (${PROJECT_BINARY_DIR}) # Build the main executable and link it add_executable (${PROJECT_NAME} ${PROJECT_NAME}.c siphash.c) -target_link_libraries (${PROJECT_NAME} ${CURSES_LIBRARY} - ${dependencies_LIBRARIES} ${LIBEV_LIBRARIES} readline) +target_link_libraries (${PROJECT_NAME} ${project_libraries}) # The files to be installed include (GNUInstallDirs) |