# HG changeset patch # User Sebastien Decugis # Date 1273738251 -32400 # Node ID 71e5083796718126e1559f7e927de5ea083c0c49 # Parent 2a456dccee598f8d68b3764a6ba0c54b9af9dff3 Initial test for 'make install' command diff -r 2a456dccee59 -r 71e508379671 CMakeLists.txt --- a/CMakeLists.txt Thu May 13 16:57:47 2010 +0900 +++ b/CMakeLists.txt Thu May 13 17:10:51 2010 +0900 @@ -52,3 +52,8 @@ IF(NOT IGNORE_ALL_EXTENSIONS) SUBDIRS(extensions) ENDIF(NOT IGNORE_ALL_EXTENSIONS) + +# The documentation to install +INSTALL(FILES README LICENCE doc/freediameter.conf.sample + DESTINATION doc + COMPONENT freeDiameter-doc) diff -r 2a456dccee59 -r 71e508379671 INSTALL --- a/INSTALL Thu May 13 16:57:47 2010 +0900 +++ b/INSTALL Thu May 13 17:10:51 2010 +0900 @@ -18,8 +18,6 @@ Note that there are dependencies on external tools that may not be enforced by the configure script. See the specific INSTALL.distro files matching your situation. -make install has not been tested yet and will probably not behave as expected. - You can configure which extensions to build with CMake: IGNORE_ALL_EXTENSIONS:BOOL=OFF (or the following are ignored) BUILD_SAMPLE:BOOL=ON diff -r 2a456dccee59 -r 71e508379671 freeDiameter/CMakeLists.txt --- a/freeDiameter/CMakeLists.txt Thu May 13 16:57:47 2010 +0900 +++ b/freeDiameter/CMakeLists.txt Thu May 13 17:10:51 2010 +0900 @@ -63,6 +63,11 @@ LINK_DIRECTORIES(${CURRENT_BINARY_DIR}/../libfreeDiameter) TARGET_LINK_LIBRARIES(freeDiameterd libfreeDiameter ${FD_LIBS}) +# The daemon is to be installed as part of the freeDiameter-daemon component. +INSTALL(TARGETS freeDiameterd + RUNTIME DESTINATION bin + COMPONENT freeDiameter-daemon) + # Save the list of files, if needed SET(FD_COMMON_SRC ${FD_COMMON_SRC} PARENT_SCOPE) SET(FD_COMMON_GEN_SRC ${FD_COMMON_GEN_SRC} PARENT_SCOPE) diff -r 2a456dccee59 -r 71e508379671 libfreeDiameter/CMakeLists.txt --- a/libfreeDiameter/CMakeLists.txt Thu May 13 16:57:47 2010 +0900 +++ b/libfreeDiameter/CMakeLists.txt Thu May 13 17:10:51 2010 +0900 @@ -25,6 +25,11 @@ # The library itself needs other libraries TARGET_LINK_LIBRARIES(libfreeDiameter ${FD_LIBS}) +# The library is to be installed as part of the freeDiameter-common component. +INSTALL(TARGETS libfreeDiameter + LIBRARY DESTINATION lib + COMPONENT freeDiameter-common) + # Save the list of files for testcases in the daemon's directory SET(LFD_SRC ${LFD_SRC} PARENT_SCOPE)