Skip to content

Commit d26e68a

Browse files
committed
Redo cmake version
1 parent 097cdeb commit d26e68a

File tree

7 files changed

+9
-124
lines changed

7 files changed

+9
-124
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22

33
project(libbarrett)
44
set(libbarrett_VERSION_MAJOR 3)
@@ -22,8 +22,8 @@ set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/modules/")
2222
option(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON)
2323
option(OPTIMIZE_FOR_PROCESSOR "Set to ON to build binaries that are optimized for this specific computer and can't be copied to other machines" OFF)
2424
option(WITH_PYTHON "Set to ON to build Python bindings for libbarrett" ON)
25-
option(INSTALL_EXAMPLES "Set to ON to copy libbarrett example programs to the current user's home folder when the library is installed" ON)
26-
option(INSTALL_SANDBOX "Set to ON to copy libbarrett sandbox programs to the current user's home folder when the library is installed" ON)
25+
option(INSTALL_EXAMPLES "Set to ON to copy libbarrett example programs to the current user's home folder when the library is installed" OFF)
26+
option(INSTALL_SANDBOX "Set to ON to copy libbarrett sandbox programs to the current user's home folder when the library is installed" OFF)
2727
option(CONFIG_PACKAGE "Set to ON to set up CPACK variables necessary for packaging" OFF)
2828
option(CONFIG_DEBIAN "Set to ON to copy standard barrett-config.cmake, required for Debian packaging" OFF)
2929

@@ -118,8 +118,8 @@ set(exported_link_dirs ${exported_link_dirs} ${Boost_LIBRARY_DIRS})
118118

119119
## Eigen3
120120
find_package(Eigen3 REQUIRED)
121-
include_directories(${Eigen_INCLUDE_DIRS})
122-
set(exported_include_dirs ${exported_include_dirs} ${Eigen_INCLUDE_DIRS})
121+
include_directories(${EIGEN_INCLUDE_DIRS})
122+
set(exported_include_dirs ${exported_include_dirs} ${EIGEN_INCLUDE_DIRS})
123123

124124

125125
## curses

cmake/modules/FindEigen2.cmake

Lines changed: 0 additions & 74 deletions
This file was deleted.

cmake/modules/FindEigen3.cmake

Lines changed: 0 additions & 41 deletions
This file was deleted.

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(libbarrett_examples)
33

44

sandbox/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(libbarrett_sandbox)
33

44

sandbox/feather_touch/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(feather_touch)
33

44
## libbarrett

sandbox/teach_and_play/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(teach_and_play)
33

44
## libbarrett

0 commit comments

Comments
 (0)