Fix some cmake issues

fix #2551
This commit is contained in:
Florent Le Coz
2014-06-30 01:02:59 +02:00
parent 48ed47207c
commit a165e59240
+6 -7
View File
@@ -173,15 +173,13 @@ target_link_libraries(${PROJECT_NAME}
if(SYSTEMDDAEMON_FOUND)
target_link_libraries(xmpp ${SYSTEMDDAEMON_LIBRARIES})
endif()
if(WITH_DOC)
add_dependencies(${PROJECT_NAME} doc)
endif()
#
## Tests
#
add_executable(test_suite src/test.cpp)
add_executable(test_suite EXCLUDE_FROM_ALL
src/test.cpp)
target_link_libraries(test_suite
xmpp
irc
@@ -190,6 +188,7 @@ target_link_libraries(test_suite
config
logger)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config.h)
#
@@ -198,7 +197,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.cmake ${CMAKE_CURRENT_BI
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION bin)
if(WITH_DOC)
install(FILES ${MAN_PAGE} DESTINATION man/man1)
install(FILES ${MAN_PAGE} DESTINATION share/man/man1 OPTIONAL)
endif()
#
@@ -208,4 +207,4 @@ endif()
add_custom_target(dist
COMMAND git archive --prefix=${ARCHIVE_NAME}/ --format=tar HEAD
| xz > ${CMAKE_CURRENT_BINARY_DIR}/${ARCHIVE_NAME}.tar.xz
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})