[trunk] FolderReorgProposal task: move source code to source dir

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a0d7779b5b51efc331d5b5c5b53668d6b059786..db3c5eff366b0fb1915aaafd6b539a067e26a32a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,7 +172,6 @@ OPJ_TEST_LARGE_FILES(OPJ_HAVE_LARGEFILES)
 
 #-----------------------------------------------------------------------------
 # Build Library
-include_directories(BEFORE ${OPENJPEG_BINARY_DIR})
 add_subdirectory(src)
 
 #-----------------------------------------------------------------------------
@@ -203,15 +202,6 @@ add_subdirectory(wrapping)
 include(CheckTypeSize)
 CHECK_TYPE_SIZE(ssize_t     SSIZE_T)
 
-#-----------------------------------------------------------------------------
-# opj_config.h generation (2/2)
-configure_file("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
- "${OPENJPEG_BINARY_DIR}/opj_config.h"
- @ONLY
- )
-#
-install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
- DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
 option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)

diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index 62047e42a705d47b5051978f2094d8dedc93fac8..46943c5ed7c575bfa4101dcdf08a16af39757582 100644 (file)
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -10,6 +10,7 @@ set(common_SRCS
 
 # Headers file are located here:
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${LCMS_INCLUDE_DIRNAME}

diff --git a/src/bin/jpip/CMakeLists.txt b/src/bin/jpip/CMakeLists.txt
index d887aa7a176af2fe8352712805341c3865ade3c1..6a411a03c15bc26a656f9d577ebaa167a96c4215 100644 (file)
--- a/src/bin/jpip/CMakeLists.txt
+++ b/src/bin/jpip/CMakeLists.txt
@@ -1,6 +1,7 @@
 # Headers file are located here:
 include_directories(
-  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2 # opj_stdint.h
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+  ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjpip
   ${FCGI_INCLUDE_DIRS}
 )

diff --git a/src/bin/jpwl/CMakeLists.txt b/src/bin/jpwl/CMakeLists.txt
index c9bc2219a45a5de25ab69d4076ddb5583e498f36..553b38e60a48af4e5f258b03c1ab4d77de120f6e 100644 (file)
--- a/src/bin/jpwl/CMakeLists.txt
+++ b/src/bin/jpwl/CMakeLists.txt
@@ -10,6 +10,7 @@ set(common_SRCS
 
 # Headers file are located here:
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${LCMS_INCLUDE_DIRNAME}

diff --git a/src/bin/mj2/CMakeLists.txt b/src/bin/mj2/CMakeLists.txt
index e27fc50e6087c3b44bbbab31d674a23080380c78..85174b08522cc43cd02fede56b77a3ed16248837 100644 (file)
--- a/src/bin/mj2/CMakeLists.txt
+++ b/src/bin/mj2/CMakeLists.txt
@@ -38,6 +38,7 @@ endif()
 
 # Headers file are located here:
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${OPENJPEG_SOURCE_DIR}/src/lib/openmj2
   ${OPENJPEG_SOURCE_DIR}/src/bin/common

diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index f58fe59ddc930d8f18c988b55f02c9b3a5d3a93c..8739ccaa7221f7dbb20bb9f8506dbd24cb8263f0 100644 (file)
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -1,4 +1,20 @@
 include_regular_expression("^.*$")
+
+#-----------------------------------------------------------------------------
+# opj_config.h generation (2/2)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/opj_config.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
+ @ONLY
+ )
+#
+install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
+ DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
+
+include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
+)
+
 # Defines the source code for the library
 set(OPENJPEG_SRCS
   ${CMAKE_CURRENT_SOURCE_DIR}/bio.c

diff --git a/opj_config.h.cmake.in b/src/lib/openjp2/opj_config.h.cmake.in
similarity index 100%
rename from opj_config.h.cmake.in
rename to src/lib/openjp2/opj_config.h.cmake.in

diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
index e42e95fc2af2eb0933ad02a3535f86e45873375b..531875749051be56ad94a78ab94099d5b006525c 100644 (file)
--- a/src/lib/openjpip/CMakeLists.txt
+++ b/src/lib/openjpip/CMakeLists.txt
@@ -1,6 +1,7 @@
 include_regular_expression("^.*$")
 
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${FCGI_INCLUDE_DIRS}
   ${CURL_INCLUDE_DIRS}

diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt
index 1cbf901d251c8c2ebeca870de8c74bb1f0465ec7..e5f02d48eddee707cf5a2ce23679d2a8e407714e 100644 (file)
--- a/src/lib/openjpwl/CMakeLists.txt
+++ b/src/lib/openjpwl/CMakeLists.txt
@@ -38,6 +38,7 @@ if(APPLE)
 endif()
 
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${OPENJPEG_SOURCE_DIR}/src/lib
   )

diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt
index 59e2143b853dd7c8d8df9833388e376935509a50..6ae7358306ea9e582eba7093585e6b30f888191b 100644 (file)
--- a/src/lib/openmj2/CMakeLists.txt
+++ b/src/lib/openmj2/CMakeLists.txt
@@ -14,6 +14,7 @@ if(WIN32)
 endif(WIN32)
 
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   )
 

diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt
index 3641f6acab45484c35dc42bc474de7a7aeeb5b6f..c0566eab5cfbc7852559abdbad618e937abb189c 100644 (file)
--- a/wrapping/java/openjp2/CMakeLists.txt
+++ b/wrapping/java/openjp2/CMakeLists.txt
@@ -12,6 +12,7 @@ include_directories(${JNI_INCLUDE_DIRS})
 
 # required header file:
 include_directories(
+  ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h
   ${OPENJPEG_SOURCE_DIR}/src/lib/openjp2
   ${OPENJPEG_SOURCE_DIR}/src/bin/common
   ${OPENJPEG_SOURCE_DIR}/src/bin/jp2