"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
gmic_2.8.1.tar.gz and gmic_2.8.2.tar.gz

About: G’MIC (GREY’s Magic for Image Computing) is a framework for image processing. It provides several different user interfaces to convert/manipulate/filter/ visualize generic image datasets (usable standalone or as plug-in for GIMP and Krita).

CMakeLists.txt  (gmic_2.8.1):CMakeLists.txt  (gmic_2.8.2)
skipping to change at line 85 skipping to change at line 85
include(FeatureSummary) include(FeatureSummary)
include(GNUInstallDirs) include(GNUInstallDirs)
# options controlling the build process # options controlling the build process
option(BUILD_LIB "Build the GMIC shared library" ON) option(BUILD_LIB "Build the GMIC shared library" ON)
option(BUILD_LIB_STATIC "Build the GMIC static library" ON) option(BUILD_LIB_STATIC "Build the GMIC static library" ON)
option(BUILD_CLI "Build the CLI interface" ON) option(BUILD_CLI "Build the CLI interface" ON)
option(BUILD_MAN "Build the manpage" ON) option(BUILD_MAN "Build the manpage" ON)
option(BUILD_BASH_COMPLETION "Build Bash completion" ON) option(BUILD_BASH_COMPLETION "Build Bash completion" ON)
option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF) option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF)
option(ENABLE_CURL "Add support for curl" ON)
option(ENABLE_X "Add support for X11" ON) option(ENABLE_X "Add support for X11" ON)
option(ENABLE_FFMPEG "Add support for FFMpeg" ON) option(ENABLE_FFMPEG "Add support for FFMpeg" ON)
option(ENABLE_FFTW "Add support for FFTW" ON) option(ENABLE_FFTW "Add support for FFTW" ON)
option(ENABLE_GRAPHICSMAGICK "Add support for GrahicsMagick" ON) option(ENABLE_GRAPHICSMAGICK "Add support for GrahicsMagick" ON)
option(ENABLE_JPEG "Add support for handling images in Jpeg format" ON) option(ENABLE_JPEG "Add support for handling images in Jpeg format" ON)
option(ENABLE_OPENCV "Add support for OpenCV" ON) option(ENABLE_OPENCV "Add support for OpenCV" ON)
option(ENABLE_OPENEXR "Add support for handling images in EXR format" ON) option(ENABLE_OPENEXR "Add support for handling images in EXR format" ON)
option(ENABLE_OPENMP "Add support for parallel processing" ON) option(ENABLE_OPENMP "Add support for parallel processing" ON)
option(ENABLE_PNG "Add support for handling images in PNG format" ON) option(ENABLE_PNG "Add support for handling images in PNG format" ON)
option(ENABLE_TIFF "Add support for handling images in Tiff format" ON) option(ENABLE_TIFF "Add support for handling images in Tiff format" ON)
skipping to change at line 138 skipping to change at line 139
# Zlib support # Zlib support
if(ENABLE_ZLIB) if(ENABLE_ZLIB)
find_package(ZLIB) find_package(ZLIB)
endif() endif()
if(ZLIB_FOUND) if(ZLIB_FOUND)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_zlib") set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_zlib")
include_directories(${ZLIB_INCLUDE_DIRS}) include_directories(${ZLIB_INCLUDE_DIRS})
link_directories(${ZLIB_LIBRARY_DIRS}) link_directories(${ZLIB_LIBRARY_DIRS})
endif() endif()
# curl support
if(ENABLE_CURL)
find_package(CURL)
endif()
if(CURL_FOUND)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_use_curl")
include_directories(${CURL_INCLUDE_DIRS})
link_directories(${CURL_LIBRARY_DIRS})
endif()
#X11 support #X11 support
if(ENABLE_X) if(ENABLE_X)
find_package(X11) find_package(X11)
endif() endif()
if(X11_FOUND) if(X11_FOUND)
set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\ \"") set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\ \"")
include_directories(${X11_INCLUDE_DIR}) include_directories(${X11_INCLUDE_DIR})
include_directories(${X11_INCLUDE_DIRS}) include_directories(${X11_INCLUDE_DIRS})
link_directories(${X11_LIBRARY_DIR}) link_directories(${X11_LIBRARY_DIR})
link_directories(${X11_LIBRARY_DIRS}) link_directories(${X11_LIBRARY_DIRS})
skipping to change at line 288 skipping to change at line 299
endif() endif()
target_link_libraries(libgmic target_link_libraries(libgmic
${X11_LIBRARIES} ${X11_LIBRARIES}
${TIFF_LIBRARIES} ${TIFF_LIBRARIES}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${JPEG_LIBRARIES} ${JPEG_LIBRARIES}
${GRAPHICSMAGICK_LIBRARIES} ${GRAPHICSMAGICK_LIBRARIES}
${OPENEXR_LIBRARIES} ${OPENEXR_LIBRARIES}
${OPENCV_LIBRARIES} ${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${CURL_LIBRARIES}
${FFTW3_LIBRARIES} ${FFTW3_LIBRARIES}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
) )
install(TARGETS libgmic EXPORT GmicTargets install(TARGETS libgmic EXPORT GmicTargets
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_LIBDIR}" PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )
skipping to change at line 315 skipping to change at line 327
set_target_properties(libgmicstatic PROPERTIES OUTPUT_NAME "gmic") set_target_properties(libgmicstatic PROPERTIES OUTPUT_NAME "gmic")
target_link_libraries(libgmicstatic target_link_libraries(libgmicstatic
${X11_LIBRARIES} ${X11_LIBRARIES}
${TIFF_LIBRARIES} ${TIFF_LIBRARIES}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${JPEG_LIBRARIES} ${JPEG_LIBRARIES}
${GRAPHICSMAGICK_LIBRARIES} ${GRAPHICSMAGICK_LIBRARIES}
${OPENEXR_LIBRARIES} ${OPENEXR_LIBRARIES}
${OPENCV_LIBRARIES} ${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${CURL_LIBRARIES}
${FFTW3_LIBRARIES} ${FFTW3_LIBRARIES}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
) )
install(TARGETS libgmicstatic EXPORT GmicTargets ARCHIVE DESTINATION "${CMAKE_ INSTALL_LIBDIR}") install(TARGETS libgmicstatic EXPORT GmicTargets ARCHIVE DESTINATION "${CMAKE_ INSTALL_LIBDIR}")
install(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") install(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
endif() endif()
if(BUILD_CLI) if(BUILD_CLI)
if(ENABLE_DYNAMIC_LINKING) if(ENABLE_DYNAMIC_LINKING)
skipping to change at line 343 skipping to change at line 356
add_dependencies(gmic gmic_extra_headers) add_dependencies(gmic gmic_extra_headers)
target_link_libraries(gmic target_link_libraries(gmic
${X11_LIBRARIES} ${X11_LIBRARIES}
${TIFF_LIBRARIES} ${TIFF_LIBRARIES}
${PNG_LIBRARIES} ${PNG_LIBRARIES}
${JPEG_LIBRARIES} ${JPEG_LIBRARIES}
${GRAPHICSMAGICK_LIBRARIES} ${GRAPHICSMAGICK_LIBRARIES}
${OPENEXR_LIBRARIES} ${OPENEXR_LIBRARIES}
${OPENCV_LIBRARIES} ${OPENCV_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
${CURL_LIBRARIES}
${FFTW3_LIBRARIES} ${FFTW3_LIBRARIES}
${EXTRA_LIBRARIES} ${EXTRA_LIBRARIES}
) )
endif() endif()
set_target_properties(gmic PROPERTIES COMPILE_FLAGS "${CLI_COMPILE_FLAGS}") set_target_properties(gmic PROPERTIES COMPILE_FLAGS "${CLI_COMPILE_FLAGS}")
install(TARGETS gmic RUNTIME DESTINATION bin LIBRARY DESTINATION lib) install(TARGETS gmic RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
endif() endif()
if(BUILD_MAN) if(BUILD_MAN)
 End of changes. 5 change blocks. 
0 lines changed or deleted 14 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)