Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
eigenpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Stack Of Tasks
eigenpy
Commits
051303b1
Verified
Commit
051303b1
authored
5 years ago
by
Justin Carpentier
Browse files
Options
Downloads
Patches
Plain Diff
cmake: reflect change in the CMake module
parent
799045cc
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-3
3 additions, 3 deletions
CMakeLists.txt
unittest/CMakeLists.txt
+5
-6
5 additions, 6 deletions
unittest/CMakeLists.txt
with
8 additions
and
9 deletions
CMakeLists.txt
+
3
−
3
View file @
051303b1
...
@@ -14,7 +14,6 @@ INCLUDE(cmake/base.cmake)
...
@@ -14,7 +14,6 @@ INCLUDE(cmake/base.cmake)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/boost.cmake
)
INCLUDE
(
cmake/python.cmake
)
INCLUDE
(
cmake/python.cmake
)
INCLUDE
(
cmake/ide.cmake
)
INCLUDE
(
cmake/ide.cmake
)
INCLUDE
(
cmake/test.cmake
)
SET
(
PROJECT_NAME eigenpy
)
SET
(
PROJECT_NAME eigenpy
)
SET
(
PROJECT_DESCRIPTION
"Wrapping Eigen3 -- numpy"
)
SET
(
PROJECT_DESCRIPTION
"Wrapping Eigen3 -- numpy"
)
...
@@ -25,6 +24,7 @@ SET(CXX_DISABLE_WERROR True)
...
@@ -25,6 +24,7 @@ SET(CXX_DISABLE_WERROR True)
SET
(
CMAKE_VERBOSE_MAKEFILE True
)
SET
(
CMAKE_VERBOSE_MAKEFILE True
)
SETUP_PROJECT
()
SETUP_PROJECT
()
MESSAGE
(
STATUS
"BUILD_TESTING=
${
BUILD_TESTING
}
"
)
STRING
(
REPLACE
"-pedantic"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
STRING
(
REPLACE
"-pedantic"
""
CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
IF
(
APPLE
)
IF
(
APPLE
)
...
@@ -53,9 +53,9 @@ OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
...
@@ -53,9 +53,9 @@ OPTION(INSTALL_DOCUMENTATION "Generate and install the documentation" FALSE)
OPTION
(
BUILD_UNIT_TESTS
"Build the unitary tests"
OFF
)
OPTION
(
BUILD_UNIT_TESTS
"Build the unitary tests"
OFF
)
IF
(
BUILD_UNIT_TESTS
)
IF
(
BUILD_UNIT_TESTS
)
SET
(
DISABLE_TESTS OFF
)
SET
(
BUILD_TESTING ON
)
ELSE
(
BUILD_UNIT_TESTS
)
ELSE
(
BUILD_UNIT_TESTS
)
SET
(
DISABLE_TESTS ON
)
SET
(
BUILD_TESTING OFF
)
ENDIF
(
BUILD_UNIT_TESTS
)
ENDIF
(
BUILD_UNIT_TESTS
)
FINDPYTHON
()
FINDPYTHON
()
...
...
This diff is collapsed.
Click to expand it.
unittest/CMakeLists.txt
+
5
−
6
View file @
051303b1
...
@@ -3,15 +3,14 @@
...
@@ -3,15 +3,14 @@
# Copyright (c) 2018-2019 INRIA
# Copyright (c) 2018-2019 INRIA
#
#
MACRO
(
ADD_LIB_UNIT_TEST test PKGS
)
MACRO
(
ADD_LIB_UNIT_TEST test PKGS
)
CREATE_CTEST_BUILD_TESTS_TARGET
()
CREATE_CTEST_BUILD_TESTS_TARGET
()
IF
(
BUILD_UNIT_TESTS
)
IF
(
BUILD_UNIT_TESTS
)
ADD_LIBRARY
(
${
test
}
SHARED
${
test
}
)
ADD_LIBRARY
(
${
test
}
SHARED
${
test
}
)
ELSE
(
BUILD_UNIT_TESTS
)
ELSE
(
BUILD_UNIT_TESTS
)
ADD_LIBRARY
(
${
test
}
SHARED EXCLUDE_FROM_ALL
${
test
}
)
ADD_LIBRARY
(
${
test
}
SHARED EXCLUDE_FROM_ALL
${
test
}
)
ENDIF
(
BUILD_UNIT_TESTS
)
ENDIF
(
BUILD_UNIT_TESTS
)
FOREACH
(
PKG
${
PKGS
}
)
FOREACH
(
PKG
${
PKGS
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
test
}
${
PKG
}
)
PKG_CONFIG_USE_DEPENDENCY
(
${
test
}
${
PKG
}
)
...
@@ -29,9 +28,9 @@ MACRO(ADD_LIB_UNIT_TEST test PKGS)
...
@@ -29,9 +28,9 @@ MACRO(ADD_LIB_UNIT_TEST test PKGS)
ADD_TEST
(
NAME
${
test
}
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import
${
test
}
"
)
ADD_TEST
(
NAME
${
test
}
COMMAND
${
PYTHON_EXECUTABLE
}
-c
"import
${
test
}
"
)
ADD_DEPENDENCIES
(
build_tests
${
test
}
)
ADD_DEPENDENCIES
(
build_tests
${
test
}
)
IF
(
DISABLE
_TESTS
)
IF
(
NOT BUILD_UNIT
_TESTS
)
SET_TESTS_PROPERTIES
(
${
test
}
PROPERTIES DEPENDS ctest_build_tests
)
SET_TESTS_PROPERTIES
(
${
test
}
PROPERTIES DEPENDS ctest_build_tests
)
ENDIF
(
DISABLE
_TESTS
)
ENDIF
(
NOT BUILD_UNIT
_TESTS
)
ENDMACRO
(
ADD_LIB_UNIT_TEST
)
ENDMACRO
(
ADD_LIB_UNIT_TEST
)
ADD_LIB_UNIT_TEST
(
matrix
"eigen3"
)
ADD_LIB_UNIT_TEST
(
matrix
"eigen3"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment