From 243144ae98124eab5e72bcac7b0fe70228a967a4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 3 Jan 2019 15:52:15 +0100
Subject: [PATCH] use standard CMake paths & tests
---
.gitignore | 2 --
CMakeLists.txt | 4 +---
tests/CMakeLists.txt | 11 ++---------
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8339c71..8d3185a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,4 @@
# Build and Release Folders
-bin/
-lib/
build/
build-rel/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3dd6b4..da592d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 2.6)
project(spline)
INCLUDE(cmake/base.cmake)
+INCLUDE(cmake/test.cmake)
INCLUDE(cmake/python.cmake)
SET(PROJECT_ORG humanoid-path-planner)
@@ -10,9 +11,6 @@ SET(PROJECT_DESCRIPTION
)
SET(PROJECT_URL "https://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/build/")
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_SOURCE_DIR}/bin/")
-set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/lib/")
# Disable -Werror on Unix for now.
SET(CXX_DISABLE_WERROR True)
SET(CMAKE_VERBOSE_MAKEFILE True)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 874c7e3..70960bb 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,3 @@
-cmake_minimum_required(VERSION 2.6)
-
-include_directories("${PROJECT_SOURCE_DIR}/include")
-
-FILE(GLOB_RECURSE HeaderFiles "${PROJECT_SOURCE_DIR}/include/spline/*.h")
-
-add_executable(
- spline_tests ${HeaderFiles} Main.cpp
+ADD_UNIT_TEST(
+ spline_tests Main.cpp
)
-
--
GitLab