Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase required CMake version to 2.8.11 #206

Closed
wants to merge 2 commits into from
Closed

Increase required CMake version to 2.8.11 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cd8b33
Increase required CMake version to 2.8.11
leokoppel Aug 8, 2017
65219df
Capitalize CMake commands in docs
leokoppel Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave)

# COMPILER SETTINGS
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ This library contains reusable code for:
- OpenCV 3.2.0
- PCL 1.8
- yaml-cpp 0.5.1
- CMake 2.8.3
- CMake 2.8.11
- GCC 5.4

The above versions are the minimum we test against.
Some earlier versions may work, but are not tested.
For convenience, we provide a script which installs these dependencies (except
For convenience, we provide a script which installs these dependencies (except
GCC) on Ubuntu 14.04 or Ubuntu 16.04, in `scripts/install/install_deps.bash`.

## Install
Expand Down
34 changes: 14 additions & 20 deletions docs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,28 @@
cmake_minimum_required(VERSION 2.8.3)
project(wave_docs)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_docs)

# DOCS_INPUT is a space-separated list of subdirectories, used for Doxygen input
set(WAVE_DOXY_INPUT
SET(WAVE_DOXY_INPUT
"${WAVE_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/ref")

foreach(dir ${LIBWAVE_MODULES})
include_directories(${dir}/include)
set(WAVE_DOXY_INPUT "${WAVE_DOXY_INPUT} ${WAVE_SOURCE_DIR}/${dir}")
endforeach()
FOREACH(dir ${LIBWAVE_MODULES})
INCLUDE_DIRECTORIES(${dir}/include)
SET(WAVE_DOXY_INPUT "${WAVE_DOXY_INPUT} ${WAVE_SOURCE_DIR}/${dir}")
ENDFOREACH()


find_package(Doxygen)
if(DOXYGEN_FOUND)
configure_file(Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
FIND_PACKAGE(Doxygen)
IF(DOXYGEN_FOUND)
CONFIGURE_FILE(Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)

# Find images under "ref". We must copy them separately
file(GLOB_RECURSE REF_IMAGES ref "*.jpg" "*.png" "*.gif")
FILE(GLOB_RECURSE REF_IMAGES ref "*.jpg" "*.png" "*.gif")

# Generate documentation with Doxygen
add_custom_target(doc
ADD_CUSTOM_TARGET(doc
${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
COMMAND ${CMAKE_COMMAND} -E
copy ${REF_IMAGES} ${WAVE_BINARY_DIR}/docs/html
WORKING_DIRECTORY ${WAVE_SOURCE_DIR}/docs
COMMENT "Generating API documentation with Doxygen" VERBATIM
)



endif()


COMMENT "Generating API documentation with Doxygen" VERBATIM)
ENDIF()
2 changes: 1 addition & 1 deletion wave_benchmark/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_benchmark)

# DEPENDENCIES
Expand Down
2 changes: 1 addition & 1 deletion wave_containers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_containers)

# DEPENDENCIES
Expand Down
2 changes: 1 addition & 1 deletion wave_geometry/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_geometry)

# EXTERNAL PACKAGES
Expand Down
2 changes: 1 addition & 1 deletion wave_kinematics/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_kinematics)

FIND_PACKAGE(Eigen3 REQUIRED)
Expand Down
2 changes: 1 addition & 1 deletion wave_matching/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_matching)

SET(CMAKE_BUILD_TYPE DEBUG)
Expand Down
2 changes: 1 addition & 1 deletion wave_optimization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_optimization)

# PACKAGES
Expand Down
2 changes: 1 addition & 1 deletion wave_utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_utils)

# DEPENDENCIES
Expand Down
2 changes: 1 addition & 1 deletion wave_vision/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.3)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
PROJECT(wave_vision)

# DEPENDENCIES
Expand Down