diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2011-03-22 09:31:25 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2011-03-22 09:31:25 +0000 |
| commit | d5034c491f06b0dce63886230bb0ab9033e49b14 (patch) | |
| tree | b19c20c8579832c33bfd6c8f6e4947f7583fbd79 /CMakeLists.txt | |
| parent | f3879cefff028661edd89a24f0e75f00a05ea79b (diff) | |
Clean up packaging system
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@537 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 74ec2a3..edf00a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,19 +331,21 @@ add_test(jpegtran-static-crop-cmp ${CMAKE_COMMAND} -E compare_files ${CMAKE_SOUR # Installer # -set(INST_NAME ${CMAKE_PROJECT_NAME}) - if(MSVC) set(INST_PLATFORM "Visual C++") + set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-vc) + set(INST_DIR ${CMAKE_PROJECT_NAME}) elseif(MINGW) set(INST_PLATFORM GCC) - set(INST_NAME ${INST_NAME}-gcc) + set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-gcc) + set(INST_DIR ${CMAKE_PROJECT_NAME}-gcc) set(INST_DEFS -DGCC) endif() if(64BIT) set(INST_PLATFORM "${INST_PLATFORM} 64-bit") set(INST_NAME ${INST_NAME}64) + set(INST_DIR ${INST_DIR}64) set(INST_DEFS ${INST_DEFS} -DWIN64) endif() @@ -357,7 +359,8 @@ configure_file(release/libjpeg-turbo.nsi.in libjpeg-turbo.nsi @ONLY) add_custom_target(installer makensis -nocd ${INST_DEFS} libjpeg-turbo.nsi - DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static + DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom + cjpeg djpeg jpegtran jpgtest SOURCES libjpeg-turbo.nsi) install(TARGETS jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom jpgtest |