GothenburgBitFactory/taskshell
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskshell.git synced 2025-06-26 10:54:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake

Browse source 
- Made libreadline required.
- Removed wordexp check.
- Updated pthreads discovery.
This commit is contained in:
Paul Beckingham 2014-06-20 07:48:35 -04:00
parent c9e37e667f
commit add6ddcf15
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -64,29 +64,25 @@ set (PACKAGE_VERSION "${VERSION}")
set (PACKAGE_STRING "${PACKAGE} ${VERSION}") set (PACKAGE_STRING "${PACKAGE} ${VERSION}")
message ("-- Looking for pthread") message ("-- Looking for pthread")
find_path (PTHREAD_INCLUDE_DIR pthread.h) find_package (Threads)
find_library (PTHREAD_LIBRARY NAMES pthread) if (THREADS_FOUND)
if (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY)
message ("-- Found pthread: ${PTHREAD_LIBRARY}")
set (HAVE_LIBPTHREAD true) set (HAVE_LIBPTHREAD true)
set (TASKSH_INCLUDE_DIRS ${TASKSH_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIR}) set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${THREADS_INCLUDE_DIR})
set (TASKSH_LIBRARIES ${TASKSH_LIBRARIES} ${PTHREAD_LIBRARIES}) set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${THREADS_LIBRARIES})
endif (PTHREAD_INCLUDE_DIR AND PTHREAD_LIBRARY) endif (THREADS_FOUND)
# include the readline library finder module # include the readline library finder module
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules")
# find readline # find readline
message ("-- Looking for GNU Readline") message ("-- Looking for GNU Readline")
find_package (Readline) find_package (Readline REQUIRED)
if (READLINE_FOUND) if (READLINE_FOUND)
set (HAVE_READLINE true) set (HAVE_READLINE true)
set (TASKSH_INCLUDE_DIRS ${TASKSH_INCLUDE_DIRS} ${READLINE_INCLUDE_DIR}) set (TASKSH_INCLUDE_DIRS ${TASKSH_INCLUDE_DIRS} ${READLINE_INCLUDE_DIR})
set (TASKSH_LIBRARIES ${TASKSH_LIBRARIES} ${READLINE_LIBRARIES}) set (TASKSH_LIBRARIES ${TASKSH_LIBRARIES} ${READLINE_LIBRARIES})
endif (READLINE_FOUND) endif (READLINE_FOUND)
check_function_exists (wordexp HAVE_WORDEXP)
# Set the package language. # Set the package language.
if (LANGUAGE) if (LANGUAGE)
set (PACKAGE_LANGUAGE ${LANGUAGE}) set (PACKAGE_LANGUAGE ${LANGUAGE})