diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-01 14:50:26 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-01 14:50:26 +0000 |
| commit | 00aa77f2d92931b57731343d1833c29966ab1fe5 (patch) | |
| tree | b7e03455b08188680fc75d749674a7434ca07889 | |
| parent | 60fc79c717b4bc3c5ab3a45fb10dfe64a907485d (diff) | |
[trunk] FolderReorgProposal fix. 3rd party variables were not set
Update issue 177
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/lib/openjp2/CMakeLists.txt | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea71f0d9..0c956efd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -203,6 +203,14 @@ 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) if(BUILD_DOC) diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index 8739ccaa..79ab16de 100644 --- 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) |