From 2eccd9df2c16f089a64eb943b3ab633fa70c34be Mon Sep 17 00:00:00 2001 From: Massimo Gengarelli Date: Wed, 2 May 2012 22:10:14 +0200 Subject: [PATCH 1/2] Install all the headers in CMAKE_PREFIX/include --- libgrive/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libgrive/CMakeLists.txt b/libgrive/CMakeLists.txt index 6f4be84..8561cfe 100644 --- a/libgrive/CMakeLists.txt +++ b/libgrive/CMakeLists.txt @@ -28,6 +28,10 @@ file (GLOB UTIL_HEADERS ${libgrive_SOURCE_DIR}/src/util/*.hh ) +file (GLOB XML_HEADERS + ${libgrive_SOURCE_DIR}/src/xml/*.hh +) + file (GLOB LIBGRIVE_SRC src/drive/*.cc src/protocol/*.cc @@ -49,6 +53,8 @@ set_target_properties(grive PROPERTIES install(TARGETS grive LIBRARY DESTINATION lib) install(FILES ${DRIVE_HEADERS} DESTINATION include/grive/drive) install(FILES ${PROTOCOL_HEADERS} DESTINATION include/grive/protocol) +install(FILES ${UTIL_HEADERS} DESTINATION include/grive/util) +install(FILES ${XML_HEADERS} DESTINATION include/grive/xml) IF ( CPPUNIT_FOUND ) message("-- Building unitary tests along with the library and the binary") From e563f7cad617d145776eb3d54bfc69b23c9662ae Mon Sep 17 00:00:00 2001 From: Massimo Gengarelli Date: Wed, 2 May 2012 22:58:55 +0200 Subject: [PATCH 2/2] Remove old and unwanted CMakeLists --- libgrive/src/lib/CMakeLists.txt | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 libgrive/src/lib/CMakeLists.txt diff --git a/libgrive/src/lib/CMakeLists.txt b/libgrive/src/lib/CMakeLists.txt deleted file mode 100644 index 6e444c2..0000000 --- a/libgrive/src/lib/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -# lib subproject - -file(GLOB DRIVE_SOURCES - drive/*.cc -) - -file(GLOB PROTOCOL_SOURCES - protocol/*.cc -) - -file(GLOB UTIL_SOURCES - util/*.cc -) - -file(GLOB DRIVE_HEADERS - drive/*.hh -) - -file (GLOB PROTOCOL_HEADERS - protocol/*.hh -) - -file (GLOB UTIL_HEADERS - util/*.hh -) - -add_library( grive SHARED - ${DRIVE_SOURCES} - ${PROTOCOL_SOURCES} - ${UTIL_SOURCES} -) - -nstall(FILES ${UTIL_HEADERS} DESTINATION include/grive/util) \ No newline at end of file