walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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

Update issue 177
This commit is contained in:
Mathieu Malaterre 2012-10-01 14:50:26 +00:00
parent 60fc79c717
commit 00aa77f2d9
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -202,6 +202,14 @@ if(BUILD_CODEC OR BUILD_MJ2)
endif () endif ()
add_subdirectory(wrapping) 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) # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF) option(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)

7
src/lib/openjp2/CMakeLists.txt
View File

@ -1,12 +1,5 @@
include_regular_expression("^.*$") 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 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)