Fix jp3dvm version

[openjpeg.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79d8526f41d5447d3d315b3bf0d446d296c28369..98880ac3866ec36a4586c982606ff2f2f290ff1d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,9 +92,13 @@ IF(NOT OPENJPEG_INSTALL_DATA_DIR)
 ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
 
 IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
-  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/${subdir}")
+  SET(OPENJPEG_INSTALL_INCLUDE_DIR "include/")
 ENDIF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
 
+IF(NOT OPENJPEG_INSTALL_MAN_DIR)
+  SET(OPENJPEG_INSTALL_MAN_DIR "share/man/")
+ENDIF(NOT OPENJPEG_INSTALL_MAN_DIR)
+
 IF(NOT OPENJPEG_INSTALL_DOC_DIR)
   SET(OPENJPEG_INSTALL_DOC_DIR "share/doc/${subdir}")
 ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
@@ -122,7 +126,7 @@ CONFIGURE_FILE(
 
 #-----------------------------------------------------------------------------
 # OpenJPEG build configuration options.
-OPTION(BUILD_SHARED_LIBS "Build OpenJPEG with shared libraries." OFF)
+OPTION(BUILD_SHARED_LIBS "Build OpenJPEG with shared libraries." ON)
 
 #-----------------------------------------------------------------------------
 SET (EXECUTABLE_OUTPUT_PATH ${OPENJPEG_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
@@ -225,11 +229,9 @@ CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
 INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
 )
-
-#----------------- CREATE OPJ_CONFIG.H -----------------
-
-SET(CMAKE_PREFIX_PATH "/usr /usr/local /opt /opt/local")
-
+#
+SET(CMAKE_PREFIX_PATH /usr /usr/local /opt /opt/local)
+#
 FIND_FILE(HAVE_STRINGS_H strings.h)
 FIND_FILE(HAVE_INTTYPES_H inttypes.h)
 FIND_FILE(HAVE_MEMORY_H memory.h)
@@ -238,15 +240,12 @@ FIND_FILE(HAVE_STRING_H string.h)
 FIND_FILE(HAVE_SYS_STAT_H sys/stat.h)
 FIND_FILE(HAVE_SYS_TYPES_H sys/types.h)
 FIND_FILE(HAVE_UNISTD_H unistd.h)
-
+#
 # Does the system have png library installed ?
 # FIND_PACKAGE not used because not robust enough
-
-#FIND_PACKAGE(PNG)
-#SET(HAVE_PNG_H "${PNG_FOUND}")
-#SET(HAVE_LIBPNG "${PNG_FOUND}")
-
-FIND_PATH(PNG_INCLUDE_DIR png.h PATHS /usr/include /usr/include/libpng14 /usr/include/libpng12 /usr/include/libpng)
+#
+FIND_PATH(PNG_INCLUDE_DIR png.h PATHS /usr/include /usr/include/libpng14 /usr/include/libpng12 /usr/include/libpng /usr/local/include /usr/local/include/libpng14 /usr/local/include/libpng12 /usr/local/include/libpng /opt/include /opt/include/libpng14 /opt/include/libpng12 /opt/include/libpng /opt/local/include /opt/local/include/libpng14 /opt/local/include/libpng12 /opt/local/include/libpng)
+#
 IF(PNG_INCLUDE_DIR STREQUAL "PNG_INCLUDE_DIR-NOTFOUND")
   SET(HAVE_PNG_H 0)
 ELSE()
@@ -263,14 +262,10 @@ IF(HAVE_LIBPNG AND HAVE_PNG_H)
 ELSE()
   SET(PNG_FOUND 0)
 ENDIF()
-
+#
 # Does the system have tiff library installed ?
 # FIND_PACKAGE not used because not robust enough
-
-#FIND_PACKAGE(TIFF)
-#SET(HAVE_TIFF_H "${TIFF_FOUND}")
-#SET(HAVE_LIBTIFF "${TIFF_FOUND}")
-
+#
 FIND_PATH(TIFF_INCLUDE_DIR tiff.h)
 IF(TIFF_INCLUDE_DIR STREQUAL "TIFF_INCLUDE_DIR-NOTFOUND")
   SET(HAVE_TIFF_H 0)
@@ -288,12 +283,12 @@ IF(HAVE_LIBTIFF AND HAVE_TIFF_H)
 ELSE()
   SET(TIFF_FOUND 0)
 ENDIF()
-
+#
 # Does the system have lcms library installed ?
-
+#
 SET(LCMS_LIB "")
 FIND_FILE(LCMS2_HEADER_FOUND lcms2.h)
-
+#
 IF(LCMS2_HEADER_FOUND STREQUAL "LCMS2_HEADER_FOUND-NOTFOUND")
  SET(LCMS2_HEADER_FOUND "")
 ENDIF()
@@ -327,7 +322,7 @@ IF(NOT LCMS2_HEADER_FOUND)
   ENDIF()
  ENDIF()
 ENDIF()
-
+#
 # generate opj_config.h
 CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_configh.cmake.in"
   "${OPENJPEG_BINARY_DIR}/opj_config.h"