Mercurial > hg > freeDiameter
changeset 300:71e508379671
Initial test for 'make install' command
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Thu, 13 May 2010 17:10:51 +0900 |
| parents | 2a456dccee59 |
| children | e7f283c06ffc |
| files | CMakeLists.txt INSTALL freeDiameter/CMakeLists.txt libfreeDiameter/CMakeLists.txt |
| diffstat | 4 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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
--- 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)
--- 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)