]> granicus.if.org Git - libjpeg-turbo/commitdiff
Allow installation from the build system (without needing to build an installer)
authorDRC <dcommander@users.sourceforge.net>
Sat, 16 Oct 2010 21:55:14 +0000 (21:55 +0000)
committerDRC <dcommander@users.sourceforge.net>
Sat, 16 Oct 2010 21:55:14 +0000 (21:55 +0000)
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@272 632fc199-4ca6-4c93-a231-07263d6284db

CMakeLists.txt
sharedlib/CMakeLists.txt

index 6b3b04b8576d61b66380e92f14db7516672c66d1..df35a0bd2d4df2cba98b40d46c705353bd9a5b2a 100644 (file)
@@ -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)
index 24426645d3384d52414d464f48f611ed21466f54..369a3ed80af16a99f17d829a9e8fabc04f6c7094 100755 (executable)
@@ -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)