Skip to content

Commit 0408bd8

Browse files
olivier-stasseOlivier Stasse
authored andcommitted
[cmake] Switch to CMake export
1 parent a868b33 commit 0408bd8

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

CMakeLists.txt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,30 @@
22

33
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
44

5-
INCLUDE(cmake/base.cmake)
6-
INCLUDE(cmake/boost.cmake)
7-
INCLUDE(cmake/eigen.cmake)
8-
INCLUDE(cmake/pthread.cmake)
95

106
SET(PROJECT_ORG stack-of-tasks)
117
SET(PROJECT_NAME dynamic-graph)
128
SET(PROJECT_DESCRIPTION "Dynamic graph library")
139
SET(PROJECT_URL "http://github.com/${PROJECT_ORG}/${PROJECT_NAME}")
1410
SET(PROJECT_SUFFIX "-v3")
1511

12+
INCLUDE(cmake/base.cmake)
13+
PROJECT(${PROJECT_NAME} CXX)
14+
15+
INCLUDE(cmake/boost.cmake)
16+
INCLUDE(cmake/eigen.cmake)
17+
INCLUDE(cmake/pthread.cmake)
18+
19+
# Export CMake Target
20+
SET(PROJECT_USE_CMAKE_EXPORT TRUE)
21+
1622
SET(CUSTOM_HEADER_DIR "${PROJECT_NAME}")
1723

1824
SET(DOXYGEN_USE_MATHJAX YES)
1925

2026
# Defines paths.
2127
SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
2228

23-
SETUP_PROJECT()
24-
2529
# Add configuration headers for plug-ins.
2630
GENERATE_CONFIGURATION_HEADER(
2731
${HEADER_DIR} config-tracer.hh DG_TRACER tracer_EXPORTS)
@@ -53,3 +57,4 @@ ADD_SUBDIRECTORY(include/${PROJECT_NAME})
5357
ADD_SUBDIRECTORY(tests)
5458

5559
SETUP_PROJECT_FINALIZE()
60+
SETUP_PROJECT_PACKAGE_FINALIZE()

include/dynamic-graph/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ SET(${PROJECT_NAME}_HEADERS
5050
logger.h
5151
)
5252

53-
INSTALL(FILES ${${PROJECT_NAME}_HEADERS}
54-
DESTINATION include/${PROJECT_NAME}
53+
INSTALL(FILES ${${PROJECT_NAME}_HEADERS}
54+
DESTINATION include/${PROJECT_NAME}
5555
)

src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${Boost_LIBRARIES})
5454
#ENDIF (UNIX AND NOT APPLE)
5555
5656
INSTALL(TARGETS ${LIBRARY_NAME}
57+
EXPORT ${TARGETS_EXPORT_NAME}
5758
DESTINATION ${CMAKE_INSTALL_LIBDIR})
5859
5960
####################################
@@ -79,5 +80,5 @@ FOREACH(plugin_file ${plugins_list})
7980
PREFIX ""
8081
)
8182
82-
INSTALL(TARGETS ${plugin} DESTINATION ${PLUGINDIR})
83+
INSTALL(TARGETS ${plugin} EXPORT ${TARGET_NAME} DESTINATION ${PLUGINDIR})
8384
ENDFOREACH(plugin_file)

0 commit comments

Comments
 (0)