install cmake/pkgconfig bits in LIB_DIR

[openjpeg.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a223fb31a768ca4fb80e01edd81e507f71650704..3c76af3f1c40746e6da5f87fa7219c1fb9b90003 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,12 @@ IF(NOT OPENJPEG_INSTALL_LIB_DIR)
   SET(OPENJPEG_INSTALL_LIB_DIR "lib")
 ENDIF(NOT OPENJPEG_INSTALL_LIB_DIR)
 
+IF(NOT OPENJPEG_INSTALL_SHARE_DIR)
+  SET(OPENJPEG_INSTALL_SHARE_DIR "share")
+ENDIF(NOT OPENJPEG_INSTALL_SHARE_DIR)
+
 IF(NOT OPENJPEG_INSTALL_DATA_DIR)
-  SET(OPENJPEG_INSTALL_DATA_DIR "share/${OPENJPEG_INSTALL_SUBDIR}")
+  SET(OPENJPEG_INSTALL_DATA_DIR "${OPENJPEG_INSTALL_SHARE_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
 ENDIF(NOT OPENJPEG_INSTALL_DATA_DIR)
 
 IF(NOT OPENJPEG_INSTALL_INCLUDE_DIR)
@@ -103,8 +107,7 @@ IF(NOT OPENJPEG_INSTALL_DOC_DIR)
 ENDIF(NOT OPENJPEG_INSTALL_DOC_DIR)
 
 IF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
-  SET(OPENJPEG_INSTALL_PACKAGE_DIR ${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}
-    CACHE INTERNAL "")
+  SET(OPENJPEG_INSTALL_PACKAGE_DIR "${OPENJPEG_INSTALL_LIB_DIR}/${OPENJPEG_INSTALL_SUBDIR}")
 ENDIF(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
 
 #-----------------------------------------------------------------------------
@@ -161,14 +164,14 @@ ENDIF(CMAKE_COMPILER_IS_GNUCC)
 #-----------------------------------------------------------------------------
 # opj_config.h generation (1/2)
 INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-CHECK_INCLUDE_FILE("strings.h"       HAVE_STRINGS_H)
-CHECK_INCLUDE_FILE("inttypes.h"       HAVE_INTTYPES_H)
+CHECK_INCLUDE_FILE("strings.h"      HAVE_STRINGS_H)
+CHECK_INCLUDE_FILE("inttypes.h"     HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILE("memory.h"       HAVE_MEMORY_H)
 CHECK_INCLUDE_FILE("stdint.h"       HAVE_STDINT_H)
 CHECK_INCLUDE_FILE("stdlib.h"       HAVE_STDLIB_H)
 CHECK_INCLUDE_FILE("string.h"       HAVE_STRING_H)
-CHECK_INCLUDE_FILE("sys/stat.h"       HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILE("sys/types.h"       HAVE_SYS_TYPES_H)
+CHECK_INCLUDE_FILE("sys/stat.h"     HAVE_SYS_STAT_H)
+CHECK_INCLUDE_FILE("sys/types.h"    HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE("unistd.h"       HAVE_UNISTD_H)
 
 
@@ -181,29 +184,23 @@ ADD_SUBDIRECTORY(libopenjpeg)
 # Build Applications
 OPTION(BUILD_CODEC "Build the CODEC executables" ON)
 OPTION(BUILD_MJ2 "Build the MJ2 executables." OFF)
+OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
 OPTION(BUILD_JPIP "Build the JPIP library and executables." OFF)
+IF(BUILD_JPIP)
+  OPTION(BUILD_JPIP_SERVER "Build the JPIP server." OFF)
+ENDIF(BUILD_JPIP)
 OPTION(BUILD_VIEWER "Build the OPJViewer executable (C++)" OFF)
+OPTION(BUILD_JAVA "Build the openjpeg jar (Java)" OFF)
 MARK_AS_ADVANCED(BUILD_VIEWER)
+MARK_AS_ADVANCED(BUILD_JAVA)
 
-IF(BUILD_JPIP)
- FIND_PACKAGE(CURL)
-ENDIF (BUILD_JPIP)
-
-IF(NOT CURL_FOUND)
- IF(BUILD_JPIP)
-  message(WARNING "You must have libcurl installed to use JPIP")
- ENDIF (BUILD_JPIP)
- SET(BUILD_JPIP OFF)
-ENDIF (NOT CURL_FOUND)
-
-# Try to find lib Z
-FIND_PACKAGE(ZLIB)
-
-IF(BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP)
+IF(BUILD_CODEC OR BUILD_MJ2)
+  # OFF: It will only build 3rd party libs if they are not found on the system
+  # ON: 3rd party libs will ALWAYS be build, and used
   OPTION(BUILD_THIRDPARTY "Build the thirdparty executables if it is needed" OFF)
   ADD_SUBDIRECTORY(thirdparty)
   ADD_SUBDIRECTORY(applications)
-ENDIF (BUILD_CODEC OR BUILD_MJ2 OR BUILD_JPIP)
+ENDIF (BUILD_CODEC OR BUILD_MJ2)
 
 #-----------------------------------------------------------------------------
 # opj_config.h generation (2/2)
@@ -212,10 +209,6 @@ CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
  @ONLY
  )
 
-#-----------------------------------------------------------------------------
-# Build JPWL-flavoured library and executables
-OPTION(BUILD_JPWL "Build the JPWL library and executables" OFF)
-
 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
 OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)