diff --git a/Changelog.md b/Changelog.md index 5f0645b..3219edf 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,6 +2,9 @@ ### Ignition Tools 1.X.X (20XX-XX-XX) +1. Remove build dependency on ruby (not needed) + * [Pull request #53](https://github.com/ignitionrobotics/ign-tools/pull/53) + 1. Remove unused cmake code related to compilations (CFlags, BUILD_TYPE, etc.) * [Pull request #55](https://github.com/ignitionrobotics/ign-tools/pull/55) diff --git a/README.md b/README.md index bbe2115..c96a69d 100644 --- a/README.md +++ b/README.md @@ -76,8 +76,6 @@ source: - cmake - git - - ruby-ronn - - ruby-dev ### Build from Source diff --git a/cmake/Ronn2Man.cmake b/cmake/Ronn2Man.cmake deleted file mode 100644 index b9a8505..0000000 --- a/cmake/Ronn2Man.cmake +++ /dev/null @@ -1,59 +0,0 @@ -# -# Based on work of Emmanuel Roullit -# Copyright 2009, 2012 Emmanuel Roullit. -# Subject to the GPL, version 2. -# -MACRO(ADD_MANPAGE_TARGET) - # It is not possible add a dependency to target 'install' - # Run hard-coded 'make man' when 'make install' is invoked - INSTALL(CODE "EXECUTE_PROCESS(COMMAND make man)") - ADD_CUSTOM_TARGET(man) -ENDMACRO(ADD_MANPAGE_TARGET) - -FIND_PROGRAM(RONN ronn) -FIND_PROGRAM(GZIP gzip) - -IF (NOT RONN OR NOT GZIP) - IF (NOT RONN) - BUILD_WARNING ("ronn not found, manpages won't be generated") - ENDIF(NOT RONN) - IF (NOT GZIP) - BUILD_WARNING ("gzip not found, manpages won't be generated") - ENDIF(NOT GZIP) - # empty macro - MACRO(manpage MANFILE) - ENDMACRO(manpage) - SET (MANPAGES_SUPPORT FALSE) -ELSE (NOT RONN OR NOT GZIP) - MESSAGE (STATUS "Looking for ronn to generate manpages - found") - SET (MANPAGES_SUPPORT TRUE) - - MACRO(manpage RONNFILE SECTION) - SET(RONNFILE_FULL_PATH ${CMAKE_CURRENT_SOURCE_DIR}/${RONNFILE}) - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION} - DEPENDS ${RONNFILE} - COMMAND ${RONN} - ARGS -r --pipe ${RONNFILE_FULL_PATH}.${SECTION}.ronn - > ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION} - ) - - ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION}.gz - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION} - COMMAND ${GZIP} -c ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION} - > ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION}.gz - ) - - SET(MANPAGE_TARGET "man-${RONNFILE}") - - ADD_CUSTOM_TARGET(${MANPAGE_TARGET} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION}.gz) - ADD_DEPENDENCIES(man ${MANPAGE_TARGET}) - - INSTALL( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${RONNFILE}.${SECTION}.gz - DESTINATION share/man/man${SECTION} - ) - ENDMACRO(manpage RONNFILE SECTION) -ENDIF(NOT RONN OR NOT GZIP) diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index ebfdc2f..6f13a25 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -1,14 +1,2 @@ include (${project_cmake_dir}/Utils.cmake) include (FindPkgConfig) - -######################################## -# The ruby Interpreter. -find_program(RUBY ruby) -if (NOT RUBY) - BUILD_ERROR ("Missing: ruby (ruby)") -endif() - -######################################## -# Include man pages stuff -include (${project_cmake_dir}/Ronn2Man.cmake) -add_manpage_target()