[trunk] FolderReorgProposal fix. 3rd party variables were not set

Update issue 177

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea71f0d97a3b31e0775272d5a73892d19e71aa95..0c956efda07db0dc7ca55096ecdb4087101e751d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -202,6 +202,14 @@ if(BUILD_CODEC OR BUILD_MJ2)
 endif ()
 add_subdirectory(wrapping)
 
+#-----------------------------------------------------------------------------
+# opj_config.h generation (2/2)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/opj_config.h.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/src/lib/openjp2/opj_config.h
+ @ONLY
+ )
+
 #-----------------------------------------------------------------------------
 # 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/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 8739ccaa7221f7dbb20bb9f8506dbd24cb8263f0..79ab16de99c2ad163747b817afed2e31aaa95da6 100644 (file)
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -1,12 +1,5 @@
 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)