diff options
Diffstat (limited to 'build_files/build_environment/cmake/jpeg.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/jpeg.cmake | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake index 7c37f2cd25e..39388ad466b 100644 --- a/build_files/build_environment/cmake/jpeg.cmake +++ b/build_files/build_environment/cmake/jpeg.cmake @@ -2,44 +2,52 @@ if(WIN32) # cmake for windows - set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON -DCMAKE_DEBUG_POSTFIX=d -DWITH_CRT_DLL=On) + set(JPEG_EXTRA_ARGS + -DNASM=${NASM_PATH} + -DWITH_JPEG8=ON + -DCMAKE_DEBUG_POSTFIX=d + -DWITH_CRT_DLL=On + -DENABLE_SHARED=OFF + -DENABLE_STATIC=ON + ) ExternalProject_Add(external_jpeg URL file://${PACKAGE_DIR}/${JPEG_FILE} DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH} - PREFIX ${BUILD_DIR}/jpg - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS} - INSTALL_DIR ${LIBDIR}/jpg + PREFIX ${BUILD_DIR}/jpeg + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS} + INSTALL_DIR ${LIBDIR}/jpeg ) - if(BUILD_MODE STREQUAL Debug) - ExternalProject_Add_Step(external_jpeg after_install - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT} ${LIBDIR}/jpg/lib/jpeg${LIBEXT} - DEPENDEES install - ) - endif() - if(BUILD_MODE STREQUAL Release) set(JPEG_LIBRARY jpeg-static${LIBEXT}) else() set(JPEG_LIBRARY jpeg-staticd${LIBEXT}) endif() + + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_jpeg after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpeg/lib/${JPEG_LIBRARY} ${LIBDIR}/jpeg/lib/jpeg${LIBEXT} + DEPENDEES install + ) + endif() + else(WIN32) # cmake for unix set(JPEG_EXTRA_ARGS -DWITH_JPEG8=ON -DENABLE_STATIC=ON -DENABLE_SHARED=OFF - -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpg/lib) + -DCMAKE_INSTALL_LIBDIR=${LIBDIR}/jpeg/lib) ExternalProject_Add(external_jpeg URL file://${PACKAGE_DIR}/${JPEG_FILE} DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH ${JPEG_HASH_TYPE}=${JPEG_HASH} - PREFIX ${BUILD_DIR}/jpg - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS} - INSTALL_DIR ${LIBDIR}/jpg + PREFIX ${BUILD_DIR}/jpeg + CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpeg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS} + INSTALL_DIR ${LIBDIR}/jpeg ) set(JPEG_LIBRARY libjpeg${LIBEXT}) |