From 1025a9cfcfcb0be47aca239dbc631121b70e08d7 Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Mon, 25 Jul 2016 09:40:13 +0200
Subject: [PATCH] [CMake] Minor reorganisation of cmake files
---
CMakeLists.txt | 16 +++++++++-------
src/CMakeLists.txt | 1 -
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5478746fa..2ab620467 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
INCLUDE(cmake/base.cmake)
INCLUDE(cmake/boost.cmake)
-INCLUDE(cmake/cpack.cmake)
INCLUDE(cmake/eigen.cmake)
INCLUDE(cmake/python.cmake)
@@ -258,9 +257,6 @@ SET(HEADERS
)
LIST(REMOVE_DUPLICATES HEADERS)
-PKG_CONFIG_APPEND_LIBS (${PROJECT_NAME})
-PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS})
-
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/math")
MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/include/pinocchio/spatial")
@@ -283,18 +279,24 @@ FOREACH(header ${HEADERS})
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE)
ENDFOREACH(header)
+# --- MAIN LIBRARY -------------------------------------------------------------
ADD_SUBDIRECTORY(src)
# --- BINDINGS -----------------------------------------------------------------
ADD_SUBDIRECTORY(bindings)
# --- EXECUTABLES --------------------------------------------------------------
-# --- EXECUTABLES --------------------------------------------------------------
-# --- EXECUTABLES --------------------------------------------------------------
+ADD_SUBDIRECTORY(utils)
+
+# --- UNIT TESTS ---------------------------------------------------------------
ADD_SUBDIRECTORY(unittest)
+
+# --- BENCHMARKS ---------------------------------------------------------------
ADD_SUBDIRECTORY(benchmark)
-ADD_SUBDIRECTORY(utils)
+# --- PACKAGING ----------------------------------------------------------------
+PKG_CONFIG_APPEND_LIBS (${PROJECT_NAME})
+PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS})
IF(EIGEN3_FUTURE)
PKG_CONFIG_APPEND_CFLAGS("-DEIGEN3_FUTURE")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0947423cd..ca7720842 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -96,7 +96,6 @@ IF(UNIX)
IF(HPP_FCL_FOUND)
PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} hpp-fcl)
- ADD_TARGET_CFLAGS (${PROJECT_NAME} "-DWITH_HPP_FCL")
ENDIF(HPP_FCL_FOUND)
IF(LUA5_1_FOUND)
--
GitLab