forked from RobotLocomotion/drake
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix CMake warning flags and package versions (RobotLocomotion#7401)
* Sync warning flags between Bazel and CMake * Specify correct minimum versions for CMake packages on Mac
- Loading branch information
1 parent
9eb22d4
commit 188b8c7
Showing
3 changed files
with
19 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,20 @@ | ||
set(CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY ON) | ||
set(CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY ON) | ||
|
||
if(APPLE) | ||
set(MINIMUM_MATLAB_VERSION 9.2) | ||
# TODO(jamiesnape): Change from 3.1 to 3.4.1 when #7278 merges. | ||
set(MINIMUM_PROTOBUF_VERSION 3.1) | ||
else() | ||
# TODO(jamiesnape): Change from 9 to 9.2 when support for R2016a and R2016 is | ||
# no longer needed. | ||
set(MINIMUM_MATLAB_VERSION 9) | ||
set(MINIMUM_PROTOBUF_VERSION 2.6.1) | ||
endif() | ||
|
||
find_package(drake CONFIG REQUIRED) | ||
find_package(Eigen3 3.3.3 CONFIG REQUIRED) | ||
find_package(Matlab 9 MODULE REQUIRED COMPONENTS | ||
find_package(Matlab ${MINIMUM_MATLAB_VERSION} MODULE REQUIRED COMPONENTS | ||
MAIN_PROGRAM MEX_COMPILER MX_LIBRARY | ||
) | ||
find_package(Protobuf 2.6 MODULE REQUIRED) | ||
find_package(Protobuf ${MINIMUM_PROTOBUF_VERSION} MODULE REQUIRED) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters