[trunk] use everywhere the new opj_ prefix for HAVE variables and use the opj_apps_config file (thanks to winfried)

1 files changed, 22 insertions, 22 deletions

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 844d1831..089ce149 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -29,8 +29,8 @@ IF(BUILD_THIRDPARTY)
   # Try to build it
   message(STATUS "We will build PNG lib from thirdparty")
   ADD_SUBDIRECTORY(libpng)
-  SET(HAVE_PNG_H 1 PARENT_SCOPE)
-  SET(HAVE_LIBPNG 1 PARENT_SCOPE)
+  SET(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
+  SET(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE)
   SET(PNG_LIBNAME png PARENT_SCOPE)
   SET(PNG_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/libpng PARENT_SCOPE)
 ELSE (BUILD_THIRDPARTY)
@@ -38,13 +38,13 @@ ELSE (BUILD_THIRDPARTY)
     FIND_PACKAGE(PNG)
     IF(PNG_FOUND)
       message(STATUS "Your system seems to have a PNG lib available, we will use it")
-      SET(HAVE_PNG_H 1 PARENT_SCOPE)
-      SET(HAVE_LIBPNG 1 PARENT_SCOPE)
+      SET(OPJ_HAVE_PNG_H 1 PARENT_SCOPE)
+      SET(OPJ_HAVE_LIBPNG 1 PARENT_SCOPE)
       SET(PNG_LIBNAME ${PNG_LIBRARIES} PARENT_SCOPE)
       SET(PNG_INCLUDE_DIRNAME ${PNG_PNG_INCLUDE_DIR} PARENT_SCOPE)
     ELSE(PNG_FOUND) # not found
-      SET(HAVE_PNG_H 0 PARENT_SCOPE)
-      SET(HAVE_LIBPNG 0 PARENT_SCOPE)
+      SET(OPJ_HAVE_PNG_H 0 PARENT_SCOPE)
+      SET(OPJ_HAVE_LIBPNG 0 PARENT_SCOPE)
       message(STATUS "PNG lib not found, activate BUILD_THIRDPARTY if you want build it")
     ENDIF(PNG_FOUND)
   ENDIF (ZLIB_FOUND)
@@ -62,27 +62,27 @@ IF(BUILD_THIRDPARTY)
     ${OPENJPEG_SOURCE_DIR}/thirdparty/libtiff
     ${OPENJPEG_BINARY_DIR}/thirdparty/libtiff
     PARENT_SCOPE)
-  SET(HAVE_TIFF_H 1 PARENT_SCOPE)
-  SET(HAVE_LIBTIFF 1 PARENT_SCOPE)
+  SET(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
+  SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
 ELSE (BUILD_THIRDPARTY)
   FIND_PACKAGE(TIFF)
   IF(TIFF_FOUND)
     message(STATUS "Your system seems to have a TIFF lib available, we will use it")
-    SET(HAVE_TIFF_H 1 PARENT_SCOPE)
-    SET(HAVE_LIBTIFF 1 PARENT_SCOPE)
+    SET(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
+    SET(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
     SET(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
     SET(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE)
   ELSE (TIFF_FOUND) # not found
-    SET(HAVE_TIFF_H 0 PARENT_SCOPE)
-    SET(HAVE_LIBTIFF 0 PARENT_SCOPE)
+    SET(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE)
+    SET(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE)
     message(STATUS "TIFF lib not found, activate BUILD_THIRDPARTY if you want build it")
   ENDIF(TIFF_FOUND)
 ENDIF(BUILD_THIRDPARTY)
 
 #------------
 # Try to find lib LCMS2 (or by default LCMS)
-SET(HAVE_LCMS_H 0 PARENT_SCOPE)
-SET(HAVE_LIBLCMS 0 PARENT_SCOPE)
+SET(OPJ_HAVE_LCMS_H 0 PARENT_SCOPE)
+SET(OPJ_HAVE_LIBLCMS 0 PARENT_SCOPE)
 
 IF( BUILD_THIRDPARTY)
   # Try to build lcms2
@@ -90,14 +90,14 @@ IF( BUILD_THIRDPARTY)
   ADD_SUBDIRECTORY(liblcms2)
   SET(LCMS_LIBNAME lcms2 PARENT_SCOPE)
   SET(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) #
-  SET(HAVE_LCMS2_H 1 PARENT_SCOPE)
-  SET(HAVE_LIBLCMS2 1 PARENT_SCOPE)
+  SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
+  SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
 ELSE (BUILD_THIRDPARTY)
   FIND_PACKAGE(LCMS2)
   IF(LCMS2_FOUND)
     message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
-    SET(HAVE_LCMS2_H 1 PARENT_SCOPE)
-    SET(HAVE_LIBLCMS2 1 PARENT_SCOPE)
+    SET(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
+    SET(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
     SET(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
     SET(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE)
   ELSE (LCMS2_FOUND) # not found lcms2
@@ -105,13 +105,13 @@ ELSE (BUILD_THIRDPARTY)
     FIND_PACKAGE(LCMS)
     IF(LCMS_FOUND)
       message(STATUS "Your system seems to have a LCMS lib available, we will use it")
-      SET(HAVE_LCMS_H 1 PARENT_SCOPE)
-      SET(HAVE_LIBLCMS 1 PARENT_SCOPE)
+      SET(OPJ_HAVE_LCMS_H 1 PARENT_SCOPE)
+      SET(OPJ_HAVE_LIBLCMS 1 PARENT_SCOPE)
       SET(LCMS_LIBNAME ${LCMS_LIBRARIES} PARENT_SCOPE)
       SET(LCMS_INCLUDE_DIRNAME ${LCMS_INCLUDE_DIRS} PARENT_SCOPE)
     ELSE (LCMS_FOUND) # not found lcms
-      SET(HAVE_LCMS2_H 0 PARENT_SCOPE)
-      SET(HAVE_LIBLCMS2 0 PARENT_SCOPE)
+      SET(OPJ_HAVE_LCMS2_H 0 PARENT_SCOPE)
+      SET(OPJ_HAVE_LIBLCMS2 0 PARENT_SCOPE)
       message(STATUS "LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it")
     ENDIF (LCMS_FOUND)
   ENDIF(LCMS2_FOUND)