diff options
| author | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-16 21:55:14 +0000 |
|---|---|---|
| committer | dcommander <dcommander@3789f03b-4d11-0410-bbf8-ca57d06f2519> | 2010-10-16 21:55:14 +0000 |
| commit | 9266a9ad0bee21a753079b18225eb04205fb53fb (patch) | |
| tree | 087c8264c32f97062b4e6fab1e36a9d305c29ff9 | |
| parent | 6439dc4c5212be692950edf63a05f3d9789357f6 (diff) | |
Allow installation from the build system (without needing to build an installer)
git-svn-id: https://libjpeg-turbo.svn.sourceforge.net/svnroot/libjpeg-turbo@272 3789f03b-4d11-0410-bbf8-ca57d06f2519
| -rw-r--r-- | trunk/CMakeLists.txt | 11 | ||||
| -rwxr-xr-x | trunk/sharedlib/CMakeLists.txt | 5 |
2 files changed, 16 insertions, 0 deletions
diff --git a/trunk/CMakeLists.txt b/trunk/CMakeLists.txt index 6b3b04b..df35a0b 100644 --- a/trunk/CMakeLists.txt +++ b/trunk/CMakeLists.txt @@ -267,3 +267,14 @@ add_custom_target(installer makensis -nocd ${INST_DEFS} libjpeg-turbo.nsi DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static SOURCES libjpeg-turbo.nsi) + +install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin +) + +install(FILES ${CMAKE_SOURCE_DIR}/LGPL.txt ${CMAKE_SOURCE_DIR}/LICENSE.txt + ${CMAKE_SOURCE_DIR}/README ${CMAKE_SOURCE_DIR}/README-turbo.txt + ${CMAKE_SOURCE_DIR}/libjpeg.txt ${CMAKE_SOURCE_DIR}/usage.txt + DESTINATION doc) diff --git a/trunk/sharedlib/CMakeLists.txt b/trunk/sharedlib/CMakeLists.txt index 2442664..369a3ed 100755 --- a/trunk/sharedlib/CMakeLists.txt +++ b/trunk/sharedlib/CMakeLists.txt @@ -53,3 +53,8 @@ target_link_libraries(djpeg jpeg) add_executable(jpegtran ../jpegtran.c ../cdjpeg.c ../rdswitch.c ../transupp.c) target_link_libraries(jpegtran jpeg) + +install(TARGETS jpeg cjpeg djpeg jpegtran + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin) |