X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=3ea2424a402bf10c0ab98e160905685b5ac9c6e5;hb=64689d05dfaaf52105581d93fb1eb173b20829a4;hp=ec42bc99bdcd0afabc398bed9bb011f702746a40;hpb=3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b;p=openjpeg.git diff --git a/CMakeLists.txt b/CMakeLists.txt index ec42bc99..3ea2424a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,8 @@ include_regular_expression("^.*$") #----------------------------------------------------------------------------- # OPENJPEG version number, useful for packaging and doxygen doc: set(OPENJPEG_VERSION_MAJOR 2) -set(OPENJPEG_VERSION_MINOR 2) -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 @@ -55,6 +55,8 @@ set(PACKAGE_VERSION # 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 @@ -350,8 +352,8 @@ include (cmake/OpenJPEGCPack.cmake) #----------------------------------------------------------------------------- # pkgconfig support -# enabled by default on Unix, disabled by default on other platforms -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)