From 221e067f9531ddb5c53a151eed6e5314f5720825 Mon Sep 17 00:00:00 2001 From: "Geoff R. McLane" Date: Tue, 12 May 2015 14:25:12 +0200 Subject: [PATCH] Change relative path to absolute so cmake can be run anywhere. The recommended place to run cmake is in the build/cmake directory, but have changed a relative path to an absolute path which should allow cmake to be run ANYWHERE!. See bottom of Issue #193 Also a few other minor tweak to CMakeLists.txt --- CMakeLists.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5aac7dc..43c733e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,9 +79,9 @@ endif () if(BUILD_SHARED_LIB) set(LIB_TYPE SHARED) - message("*** Building DLL library ${LIB_TYPE}, version ${LIBTIDY_VERSION}") + message(STATUS "*** Building DLL library ${LIB_TYPE}, version ${LIBTIDY_VERSION}") else(BUILD_SHARED_LIB) - message("*** Building static library ${LIB_TYPE}, version ${LIBTIDY_VERSION}") + message(STATUS "*** Building static library ${LIB_TYPE}, version ${LIBTIDY_VERSION}") endif(BUILD_SHARED_LIB) include_directories ( "${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/src" ) @@ -184,9 +184,9 @@ if (UNIX) if (XSLTPROC_FOUND) ## NOTE: man name must match exe ie currently `${LIB_NAME}.1` not `tidy.1` ## also could use `manpath` command output to determine target install path - message(STATUS "*** Generating man ***") set(TIDY_MANFILE ${LIB_NAME}.1) - set(TIDY1XSL ../documentation/tidy1.xsl) + message(STATUS "*** Generating man ${TIDY_MANFILE} custom commands...") + set(TIDY1XSL ${CMAKE_SOURCE_DIR}/build/documentation/tidy1.xsl) set(TIDYHELP ${CMAKE_BINARY_DIR}/tidy-help.xml) set(TIDYCONFIG ${CMAKE_BINARY_DIR}/tidy-config.xml) add_custom_target(man ALL DEPENDS "${CMAKE_BINARY_DIR}/${LIB_NAME}") @@ -217,6 +217,9 @@ if (UNIX) ) install(FILES ${CMAKE_BINARY_DIR}/${TIDY_MANFILE} DESTINATION ${MAN_INSTALL_DIR}) + else () + message(STATUS "*** NOTE: xsltproc NOT FOUND! Can NOT generate man page.") + message(STATUS "*** You need to install xsltproc in your system.") endif () endif ()