Skip to content
Snippets Groups Projects
Commit c5669d1c authored by jcarpent's avatar jcarpent
Browse files

[CMake] Correct packaging of the utils section

parent 1de6a50e
No related branches found
No related tags found
No related merge requests found
...@@ -316,8 +316,6 @@ ADD_SUBDIRECTORY(src) ...@@ -316,8 +316,6 @@ ADD_SUBDIRECTORY(src)
ADD_SUBDIRECTORY(unittest) ADD_SUBDIRECTORY(unittest)
ADD_SUBDIRECTORY(benchmark) ADD_SUBDIRECTORY(benchmark)
IF(BUILD_UTILS) ADD_SUBDIRECTORY(utils)
ADD_SUBDIRECTORY(utils)
ENDIF(BUILD_UTILS)
SETUP_PROJECT_FINALIZE() SETUP_PROJECT_FINALIZE()
# #
# Copyright (c) 2015 CNRS # Copyright (c) 2015-2016 CNRS
# #
# This file is part of Pinocchio # This file is part of Pinocchio
# pinocchio is free software: you can redistribute it # pinocchio is free software: you can redistribute it
...@@ -18,13 +18,28 @@ ...@@ -18,13 +18,28 @@
# --- MACROS ------------------------------------------------------------------ # --- MACROS ------------------------------------------------------------------
# --- MACROS ------------------------------------------------------------------ # --- MACROS ------------------------------------------------------------------
MACRO(ADD_UTIL NAME UTIL_SRC PKGS) MACRO(ADD_UTIL NAME UTIL_SRC PKGS)
ADD_EXECUTABLE(${NAME} ${UTIL_SRC})
IF(BUILD_UTILS)
ADD_EXECUTABLE(${NAME} ${UTIL_SRC})
ELSE(BUILD_UTILS)
ADD_EXECUTABLE(${NAME} EXCLUDE_FROM_ALL ${UTIL_SRC})
ENDIF(BUILD_UTILS)
FOREACH(PKG ${PKGS}) FOREACH(PKG ${PKGS})
PKG_CONFIG_USE_DEPENDENCY(${NAME} ${PKG}) PKG_CONFIG_USE_DEPENDENCY(${NAME} ${PKG})
ENDFOREACH(PKG) ENDFOREACH(PKG)
TARGET_LINK_LIBRARIES (${NAME} ${Boost_LIBRARIES} ${PROJECT_NAME}) TARGET_LINK_LIBRARIES (${NAME} ${Boost_LIBRARIES} ${PROJECT_NAME})
TARGET_LINK_BOOST_PYTHON(${NAME})
IF(BUILD_PYTHON_INTERFACE)
TARGET_LINK_LIBRARIES(${NAME} ${PYTHON_LIBRARIES})
ENDIF(BUILD_PYTHON_INTERFACE)
ADD_DEPENDENCIES(utils ${NAME}) ADD_DEPENDENCIES(utils ${NAME})
INSTALL(TARGETS ${NAME} DESTINATION bin)
IF(BUILD_UTILS)
INSTALL(TARGETS ${NAME} DESTINATION bin)
ENDIF(BUILD_UTILS)
ENDMACRO(ADD_UTIL) ENDMACRO(ADD_UTIL)
# --- RULES ------------------------------------------------------------------- # --- RULES -------------------------------------------------------------------
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment