Skip to content

Commit

Permalink
Build the manpage properly
Browse files Browse the repository at this point in the history
This now requires to use cmake 3.0.2 and above
  • Loading branch information
baruch committed Nov 6, 2015
1 parent 5b23770 commit 99b02dd
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 10 deletions.
17 changes: 12 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
language: c

before_install:
- sudo add-apt-repository ppa:kubuntu-ppa/backports -y
- sudo apt-get update -q
- sudo apt-get install cmake -y
script: cmake --version && cmake . && make VERBOSE=1
install:
- wget https://s3.amazonaws.com/biibinaries/thirdparty/cmake-3.0.2-Linux-64.tar.gz
- tar -xzf cmake-3.0.2-Linux-64.tar.gz
- sudo cp -fR cmake-3.0.2-Linux-64/* /usr
- rm -rf cmake-3.0.2-Linux-64
- rm cmake-3.0.2-Linux-64.tar.gz
script:
- cmake --version
- mkdir build
- cd build
- cmake ..
- make VERBOSE=1
sudo: true
addons:
apt:
Expand Down
14 changes: 9 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
cmake_minimum_required(VERSION 2.8.12)
project(diskscan)
cmake_minimum_required(VERSION 3.0.2)
project(diskscan
VERSION 0.18)

export(PACKAGE diskscan)

set(PACKAGE_VERSION ${PROJECT_VERSION})

# Pull in zlib
find_package(ZLIB REQUIRED)

Expand Down Expand Up @@ -40,7 +43,7 @@ add_custom_command(OUTPUT include/arch-internal.h
include_directories("include")
add_compile_options(-Wall -Wextra -Wshadow -Wmissing-prototypes -Winit-self)
add_definitions(-D_GNU_SOURCE -D_FORTIFY_SOURCE=2)
add_definitions(-DVERSION="0.18")
add_definitions(-DVERSION="${PROJECT_VERSION}")
include_directories(.)
include_directories(progressbar/include)

Expand All @@ -61,5 +64,6 @@ target_link_libraries(diskscan diskscanlib scsicmd m ${tinfo_LIBRARY} ${ZLIB_LIB
install(TARGETS diskscan
RUNTIME DESTINATION bin)

install(FILES Documentation/diskscan.1
DESTINATION man/man1 COMPONENT doc)
configure_file(Documentation/diskscan.1.in Documentation/diskscan.1)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Documentation/diskscan.1
DESTINATION share/man/man1 COMPONENT doc)

0 comments on commit 99b02dd

Please sign in to comment.