X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=3ea2424a402bf10c0ab98e160905685b5ac9c6e5;hb=64689d05dfaaf52105581d93fb1eb173b20829a4;hp=7d6b0b5575bf19afc48333e227bced3002f29ea6;hpb=3e33012bd9e510dd891217f02c5e438d61039a3e;p=openjpeg.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d6b0b55..3ea2424a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,9 @@ cmake_minimum_required(VERSION 2.8.2) if(COMMAND CMAKE_POLICY) cmake_policy(SET CMP0003 NEW) + if (NOT (${CMAKE_VERSION} VERSION_LESS 3.0)) + cmake_policy(SET CMP0042 NEW) + endif() endif() if(NOT OPENJPEG_NAMESPACE) @@ -21,7 +24,7 @@ endif() #string(TOLOWER ${OPENJPEG_NAMESPACE} OPENJPEG_LIBRARY_NAME) set(OPENJPEG_LIBRARY_NAME openjp2) -project(${OPENJPEG_NAMESPACE} C) +project(${OPENJPEG_NAMESPACE}) # Do full dependency headers. include_regular_expression("^.*$") @@ -29,8 +32,8 @@ include_regular_expression("^.*$") #----------------------------------------------------------------------------- # OPENJPEG version number, useful for packaging and doxygen doc: set(OPENJPEG_VERSION_MAJOR 2) -set(OPENJPEG_VERSION_MINOR 1) -set(OPENJPEG_VERSION_BUILD 0) +set(OPENJPEG_VERSION_MINOR 3) +set(OPENJPEG_VERSION_BUILD 1) set(OPENJPEG_VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}") set(PACKAGE_VERSION @@ -47,12 +50,18 @@ set(PACKAGE_VERSION # 1.5 | 5 # 1.5.1 | 5 # 2.0 | 6 +# 2.0.1 | 6 # 2.1 | 7 +# 2.1.1 | 7 +# 2.1.2 | 7 +# 2.2.0 | 7 +# 2.3.0 | 7 +# 2.3.1 | 7 # above is the recommendation by the OPJ team. If you really need to override this default, # you can specify your own OPENJPEG_SOVERSION at cmake configuration time: # cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg if(NOT OPENJPEG_SOVERSION) - SET(OPENJPEG_SOVERSION 7) + set(OPENJPEG_SOVERSION 7) endif(NOT OPENJPEG_SOVERSION) set(OPENJPEG_LIBRARY_PROPERTIES VERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}" @@ -62,7 +71,7 @@ set(OPENJPEG_LIBRARY_PROPERTIES # -------------------------------------------------------------------------- # Path to additional CMake modules set(CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/cmake + ${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) # -------------------------------------------------------------------------- @@ -94,6 +103,8 @@ endif() # -------------------------------------------------------------------------- # Install directories +# Build DOCUMENTATION (not in ALL target and only if Doxygen is found) +option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) string(TOLOWER ${PROJECT_NAME} projectname) set(OPENJPEG_INSTALL_SUBDIR "${projectname}-${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}") @@ -118,6 +129,7 @@ if(NOT OPENJPEG_INSTALL_INCLUDE_DIR) set(OPENJPEG_INSTALL_INCLUDE_DIR "include/${OPENJPEG_INSTALL_SUBDIR}") endif() +if(BUILD_DOC) if(NOT OPENJPEG_INSTALL_MAN_DIR) set(OPENJPEG_INSTALL_MAN_DIR "share/man/") endif() @@ -125,6 +137,7 @@ endif() if(NOT OPENJPEG_INSTALL_DOC_DIR) set(OPENJPEG_INSTALL_DOC_DIR "share/doc/${OPENJPEG_INSTALL_SUBDIR}") endif() +endif() if(NOT OPENJPEG_INSTALL_JNI_DIR) if(WIN32) @@ -141,6 +154,11 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR) set(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}") endif() +if (APPLE) + list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}") + option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF) +endif() + #----------------------------------------------------------------------------- # Big endian test: include (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) @@ -149,14 +167,15 @@ TEST_BIG_ENDIAN(OPJ_BIG_ENDIAN) #----------------------------------------------------------------------------- # Setup file for setting custom ctest vars configure_file( - ${CMAKE_SOURCE_DIR}/cmake/CTestCustom.cmake.in - ${CMAKE_BINARY_DIR}/CTestCustom.cmake + ${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake/CTestCustom.cmake.in + ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/CTestCustom.cmake @ONLY ) #----------------------------------------------------------------------------- # OpenJPEG build configuration options. option(BUILD_SHARED_LIBS "Build OpenJPEG shared library and link executables against it." ON) +option(BUILD_STATIC_LIBS "Build OpenJPEG static library." ON) set (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.") set (LIBRARY_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all libraries.") mark_as_advanced(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) @@ -177,7 +196,8 @@ if(CMAKE_COMPILER_IS_GNUCC) # For all builds, make sure openjpeg is std99 compliant: # set(CMAKE_C_FLAGS "-Wall -std=c99 ${CMAKE_C_FLAGS}") # FIXME: this setting prevented us from setting a coverage build. # Do not use ffast-math for all build, it would produce incorrect results, only set for release: - set(CMAKE_C_FLAGS_RELEASE "-ffast-math ${CMAKE_C_FLAGS_RELEASE}") + set(OPENJPEG_LIBRARY_COMPILE_OPTIONS ${OPENJPEG_LIBRARY_COMPILE_OPTIONS} "$<$:-ffast-math>") + set(OPENJP2_COMPILE_OPTIONS ${OPENJP2_COMPILE_OPTIONS} "$<$:-ffast-math>" -Wall -Wextra -Wconversion -Wunused-parameter -Wdeclaration-after-statement -Werror=declaration-after-statement) endif() #----------------------------------------------------------------------------- @@ -212,6 +232,18 @@ CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) include(TestLargeFiles) OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES) +# Allocating Aligned Memory Blocks +include(CheckIncludeFiles) +check_include_files(malloc.h OPJ_HAVE_MALLOC_H) +include(CheckSymbolExists) +# _aligned_alloc https://msdn.microsoft.com/en-us/library/8z34s9c6.aspx +check_symbol_exists(_aligned_malloc malloc.h OPJ_HAVE__ALIGNED_MALLOC) +# posix_memalign (needs _POSIX_C_SOURCE >= 200112L on Linux) +set(CMAKE_REQUIRED_DEFINITIONS -D_POSIX_C_SOURCE=200112L) +check_symbol_exists(posix_memalign stdlib.h OPJ_HAVE_POSIX_MEMALIGN) +unset(CMAKE_REQUIRED_DEFINITIONS) +# memalign (obsolete) +check_symbol_exists(memalign malloc.h OPJ_HAVE_MEMALIGN) #----------------------------------------------------------------------------- # Build Library if(BUILD_JPIP_SERVER) @@ -223,6 +255,8 @@ if(BUILD_JPIP_SERVER) endif() endif() add_subdirectory(src/lib) +option(BUILD_LUTS_GENERATOR "Build utility to generate t1_luts.h" OFF) +option(BUILD_UNIT_TESTS "Build unit tests (bench_dwt, test_sparse_array, etc..)" OFF) #----------------------------------------------------------------------------- # Build Applications @@ -256,7 +290,7 @@ configure_file( ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h @ONLY ) - + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config_private.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config_private.h @@ -264,8 +298,7 @@ configure_file( ) #----------------------------------------------------------------------------- -# Build DOCUMENTATION (not in ALL target and only if Doxygen is found) -option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) +# build documentation in doc subdir: if(BUILD_DOC) add_subdirectory(doc) endif() @@ -279,8 +312,8 @@ if(BUILD_TESTING) include(CTest) # Search openjpeg data needed for the tests - # They could be found via svn on the OpenJPEG google code project - # svn checkout http://openjpeg.googlecode.com/svn/data (about 70 Mo) + # They could be found via git on the OpenJPEG GitHub code project + # git clone https://github.com/uclouvain/openjpeg-data.git find_path(OPJ_DATA_ROOT README-OPJ-Data PATHS $ENV{OPJ_DATA_ROOT} ${CMAKE_SOURCE_DIR}/../data NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH @@ -297,8 +330,8 @@ endif() #----------------------------------------------------------------------------- # install all targets referenced as OPENJPEGTargets install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}) -configure_file( ${OPENJPEG_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in - ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake +configure_file( ${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in + ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/OpenJPEGConfig.cmake @ONLY ) install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake @@ -307,16 +340,25 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake #----------------------------------------------------------------------------- # install CHANGES and LICENSE +if(BUILD_DOC) if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES) install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) endif() + install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR}) +endif() include (cmake/OpenJPEGCPack.cmake) #----------------------------------------------------------------------------- # pkgconfig support -if(UNIX) +# enabled by default on Unix or if using GCC, disabled by default on other platforms +if(UNIX OR CMAKE_COMPILER_IS_GNUCC) + option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" ON) +else() + option(BUILD_PKGCONFIG_FILES "Build and install pkg-config files" OFF) +endif() +if(BUILD_PKGCONFIG_FILES) # install in lib and not share (see multi-arch note above) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY) @@ -349,3 +391,6 @@ if(UNIX) endif() #----------------------------------------------------------------------------- + +# build our version of astyle +SET (WITH_ASTYLE FALSE CACHE BOOL "If you plan to contribute you should reindent with scripts/prepare-commit.sh (using 'our' astyle)")