Commit Graph

87 Commits

Author SHA1 Message Date
Antonin Descampe 5fbf79e730 [1.5] revert r1399 and r1400 2012-02-10 10:01:43 +00:00
Rex Dieter ed58a22d2e install cmake/pkgconfig bits in LIB_DIR 2012-02-10 01:23:39 +00:00
Antonin Descampe 46da9f2294 [1.5] revert build documentation behaviour in cmake 2012-02-07 08:08:58 +00:00
Antonin Descampe 995b145f09 [1.5] fixes documentation generation with doxygen 2012-02-06 22:51:07 +00:00
Antonin Descampe 040c9a68b6 [1.5] remove pthread dependency in JPIP client and tweak thirdparty stuff 2012-01-25 16:30:03 +00:00
Mathieu Malaterre 2b746a71cb Refactor code to split jpip client code from server side. 2012-01-25 09:42:00 +00:00
Mathieu Malaterre 452403d393 Build conditionally the java binding 2012-01-20 14:08:59 +00:00
Mathieu Malaterre 180dd26df1 Prefer share location over lib one. 2012-01-20 11:05:11 +00:00
Mathieu Malaterre f492f0a3d6 Redo the BUILD_THIRDPARTY properly. Remove openjpeg.h symlink. 2012-01-11 13:17:15 +00:00
Mathieu Malaterre 6b1e9d1b4e Attempt to fix building of universal exe 2011-12-21 15:19:46 +00:00
Mathieu Malaterre d88dfc3472 Need to include this file back 2011-12-21 14:46:37 +00:00
Mathieu Malaterre 64f08e216b Remove old module which does not support universal binary 2011-12-21 14:43:16 +00:00
Mathieu Malaterre 0b7e0166a7 pc files are for UNIX. 2011-12-21 09:33:51 +00:00
Mathieu Malaterre 02d9f43802 Reactivate the opjviewer in cmake 2011-12-20 18:33:45 +00:00
Mathieu Malaterre fba8f701c4 Import change from trunk to be able to generate dists. 2011-12-16 11:00:30 +00:00
Mathieu Malaterre 9d1bd03be4 Import rev 1148 from trunk. 2011-12-08 11:06:53 +00:00
Vincent Torri 0c350f4908 fix compilation of libopenjpip (libcurl dependency) with CMake. Credit to Winfried. 2011-11-19 07:16:14 +00:00
Mickael Savinaud 182e4b1882 [1.5] rename opj_configh.cmake.in to opj_config.h.cmake.in and update CMakeLists.txt to be more clear 2011-10-07 12:40:36 +00:00
Mickael Savinaud 40b4ecfaec [1.5] enhance html documentation generation with cmake and add a openjpeg mainpage to this doc 2011-10-06 09:04:42 +00:00
Antonin Descampe 9a89e2f162 backport r898 to r907 in openjpeg-1.5 branch 2011-09-01 12:08:10 +00:00
Antonin Descampe 9ec5e8cf9a updated INSTALL files, fixed a bug in CMakeLists.txt that prevented finding the data directory 2011-08-22 10:42:32 +00:00
Antonin Descampe a098921d34 added cmake support to openjpip 2011-08-12 14:59:28 +00:00
Mickael Savinaud f88a57e5d7 added new decoding/dump tests based on data found in input/nonregresion repository (remove JPEG2000_CONFORMANCE_DATA_ROOT variable, add REF_DECODER_BIN_PATH variable for the encoder test suite). Remove definitively old tests 2011-07-27 12:45:04 +00:00
Mickael Savinaud a19c8a4ea3 add new decode tests based on conformance data and tolerance. Non regression is also added on the decoder output. Deactivate old tests. 2011-07-21 15:23:31 +00:00
Mickael Savinaud 65f7f8dc50 improved some CMakeLists files linked to the build of applications which used thirdparty 2011-07-13 16:49:53 +00:00
Antonin Descampe b09051fd79 fixed CTest configuration files 2011-06-30 13:52:23 +00:00
Antonin Descampe 31dba0b4e9 initial commit of OpenJPIP 1.0, a JPIP client-server architecture based on OpenJPEG (see README file in jpip directory for more details) 2011-04-14 18:37:47 +00:00
Antonin Descampe 27b894dd3f fixed applications/codec/CMakeLists.txt that prevented JPWL executables to be built with JPWL functionalities ; changed make all behaviour : DOC target removed from ALL 2011-04-14 10:13:25 +00:00
Antonin Descampe 6aaaa3eae2 changed the directory hierarchy of the whole project. See README files for details. 2011-04-13 22:38:50 +00:00
Antonin Descampe 5ef5fc65ae renamed and reorganized "jp3d" directory to "openjpeg3d". Is now a standalone directory, with independent cmake files. Done as it uses its own version of the openjpeg library and does not depend on the one currently developped. Will be removed from the trunk and stored in a branch. 2011-04-13 15:24:36 +00:00
Rex Dieter 1ab46eeff2 openjpeg.pc.cmake rewrites wrong variables (issue 67) 2011-03-30 18:44:40 +00:00
Antonin Descampe 70177d55b0 name fixing in variables related to liblcms 2011-03-24 09:50:20 +00:00
Antonin Descampe 1fd9603c55 added two files FindLCMS.cmake and FindLCMS2.cmake as they are not shipped by default with other cmake modules. 2011-03-21 21:51:04 +00:00
Antonin Descampe 279b67c838 fixed a bug that created a conflict between liblcms on the system and liblcms2 in the thirdparty directory 2011-03-21 21:22:33 +00:00
Antonin Descampe 19f9147e10 Removed the libs directory containing win32 compiled versions of libpng, libtiff and liblcms. Added a thirdparty directory to include main source files of libtiff, libpng, libz and liblcms to enable support of these formats in the codec executables. CMake will try to statically build these libraries if they are not found on the system. Note that these third party libraries are not required to build libopenjpeg (which has no dependencies). 2011-03-20 22:45:24 +00:00
Mathieu Malaterre e12008a718 Make sure to be able to compile index_create on UNIX. Install target 2011-02-16 13:55:04 +00:00
Rex Dieter 2514c5b550 cmake: SOVERSION change to 1 (from 1.4) to match auto-tools build 2011-01-18 17:23:04 +00:00
Rex Dieter d2d6e1fd6f add pkg-config support to cmake 2011-01-13 19:29:18 +00:00
Antonin Descampe 73a6ed7c21 bug fixes to enable cmake compilation on WIN32 platform (see CHANGES for details) 2011-01-02 18:10:09 +00:00
Antonin Descampe 59d9b97ffe revert to previous behaviour for cmake: builds (and links) dynamically by default. Static build only if -DBUILD_SHARED_LIBS is set to OFF. 2010-12-05 15:19:57 +00:00
Antonin Descampe eb5694ca2a changed cmake behaviour: executables are now always statically linked. When -DBUIL_SHARED_LIBS option is ON (the default), the shared versions of the libraries are also built (but executables remain linked against the static libraries). 2010-11-28 17:07:04 +00:00
Antonin Descampe 3afd3b1afd install man pages by default. install CHANGES and LICENSE 2010-11-17 10:59:21 +00:00
Antonin Descampe 223a39b51e minor changes in cmake files (from winfried) 2010-11-17 10:26:05 +00:00
Antonin Descampe 8faf300b6e fixed missing argument in main CMakeLists.txt 2010-11-17 08:39:24 +00:00
Antonin Descampe 5c76f68168 minor changes in cmake flags 2010-11-16 11:15:38 +00:00
Ben Boeckel bb9232c9d9 Don't clobber openjpeg.h from jp3d 2010-10-22 18:41:49 +00:00
Ben Boeckel 87cb9efb99 Install man pages 2010-10-22 18:41:17 +00:00
Ben Boeckel 4c9a60d4fd Default to building shared libraries 2010-10-22 18:40:33 +00:00
Antonin Descampe b6102e207c fixed paths to png and tiff in CMakeLists.txt and fixed link to lcms library (patch from winfried) 2010-10-21 09:49:54 +00:00
Antonin Descampe 453af11e2c fixed CMakeLists.txt typo 2010-10-05 19:17:01 +00:00