From ae4c89e5a7876cc3d348e6411fc42b99f8c06fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C5=99emysl=20Janouch?= Date: Thu, 14 Jan 2016 20:20:39 +0100 Subject: Try harder to find ncursesw --- CMakeLists.txt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2615758..3cbc04c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,9 +23,8 @@ set (project_VERSION "${project_VERSION}.${project_VERSION_PATCH}") set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # Dependencies -find_package (PkgConfig REQUIRED) -pkg_check_modules (ncursesw REQUIRED ncursesw) find_package (LibEV REQUIRED) +find_package (Ncursesw REQUIRED) if (USE_SYSTEM_TERMO) find_package (Termo REQUIRED) @@ -41,22 +40,20 @@ else (USE_SYSTEM_TERMO) set (Termo_LIBRARIES termo-static) endif (USE_SYSTEM_TERMO) -include_directories (${ncursesw_INCLUDE_DIRS} - ${LIBEV_INCLUDE_DIRS} ${Termo_INCLUDE_DIRS}) +set (project_libraries ${LIBEV_LIBRARIES} ${Termo_LIBRARIES} + ${NCURSESW_LIBRARIES}) +include_directories (${LIBEV_INCLUDE_DIRS} ${Termo_INCLUDE_DIRS} + ${NCURSESW_INCLUDE_DIRS}) # Configuration include (CheckFunctionExists) -set (CMAKE_REQUIRED_LIBRARIES ${ncursesw_LIBRARIES}) +set (CMAKE_REQUIRED_LIBRARIES ${project_libraries}) CHECK_FUNCTION_EXISTS ("resizeterm" HAVE_RESIZETERM) # Project source files set (project_sources ${PROJECT_NAME}.c) set (project_headers ${PROJECT_BINARY_DIR}/config.h) -# Project libraries -set (project_libraries - ${ncursesw_LIBRARIES} ${LIBEV_LIBRARIES} ${Termo_LIBRARIES}) - # Generate a configuration file configure_file (${PROJECT_SOURCE_DIR}/config.h.in ${PROJECT_BINARY_DIR}/config.h) include_directories (${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}) -- cgit v1.2.3