diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-03-03 17:55:35 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2013-03-03 17:55:35 +0000 |
| commit | e7bc30b409fc864d7bcfec60254c4404a0c69c72 (patch) | |
| tree | f4706818b6d1a7edc9859b311b23709114d1be81 /src/bin/common | |
| parent | efaefa21fc6840df42894d746f314a6df899e3e1 (diff) | |
[trunk] split into two config files config options related to the lib and to the application.
Diffstat (limited to 'src/bin/common')
| -rw-r--r-- | src/bin/common/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/bin/common/color.c | 6 | ||||
| -rw-r--r-- | src/bin/common/opj_apps_config.h.cmake.in | 13 |
3 files changed, 23 insertions, 3 deletions
diff --git a/src/bin/common/CMakeLists.txt b/src/bin/common/CMakeLists.txt index e69de29b..bb07ba7c 100644 --- a/src/bin/common/CMakeLists.txt +++ b/src/bin/common/CMakeLists.txt @@ -0,0 +1,7 @@ +#----------------------------------------------------------------------------- +# opj_apps_config.h generation +configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/opj_apps_config.h.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/opj_apps_config.h + @ONLY + )
\ No newline at end of file diff --git a/src/bin/common/color.c b/src/bin/common/color.c index a71b7410..ce9ccde3 100644 --- a/src/bin/common/color.c +++ b/src/bin/common/color.c @@ -34,14 +34,14 @@ #include <stdlib.h> #include <math.h> -#include "opj_config.h" +#include "opj_apps_config.h" #include "openjpeg.h" #include "color.h" -#ifdef HAVE_LIBLCMS2 +#ifdef OPJ_HAVE_LIBLCMS2 #include <lcms2.h> #endif -#ifdef HAVE_LIBLCMS1 +#ifdef OPJ_HAVE_LIBLCMS1 #include <lcms.h> #endif diff --git a/src/bin/common/opj_apps_config.h.cmake.in b/src/bin/common/opj_apps_config.h.cmake.in new file mode 100644 index 00000000..4ea1efa3 --- /dev/null +++ b/src/bin/common/opj_apps_config.h.cmake.in @@ -0,0 +1,13 @@ +/* create opj_apps_config.h for CMake */
+
+#cmakedefine OPJ_HAVE_LIBPNG @HAVE_LIBPNG@
+#cmakedefine OPJ_HAVE_PNG_H @HAVE_PNG_H@
+#cmakedefine OPJ_HAVE_LIBTIFF @HAVE_LIBTIFF@
+#cmakedefine OPJ_HAVE_TIFF_H @HAVE_TIFF_H@
+
+#cmakedefine OPJ_HAVE_LIBLCMS1
+#cmakedefine OPJ_HAVE_LIBLCMS2
+#cmakedefine OPJ_HAVE_LCMS1_H
+#cmakedefine OPJ_HAVE_LCMS2_H
+
+
|