Merge remote-tracking branch 'origin/master' into v0.0.3

pull/40/head
Matchman Green 2012-05-03 22:54:25 +08:00
commit 7b8d22b2b7
2 changed files with 6 additions and 33 deletions

View File

@ -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")

View File

@ -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)