Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(66)

Side by Side Diff: core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/CMakeLists.txt

Issue 758593002: Update to openjpeg r2944 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: tab Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 include_regular_expression("^.*$") 1 include_regular_expression("^.*$")
2 2
3 # 3 #
4 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h 4 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opj_config.h
5 DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers) 5 DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers)
6 6
7 include_directories( 7 include_directories(
8 ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h 8 ${OPENJPEG_BINARY_DIR}/src/lib/openjp2 # opj_config.h and opj_config_private.h
9 ) 9 )
10 # Defines the source code for the library 10 # Defines the source code for the library
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 # catching mechanism something is busted in cmake 2.8.5, I had to use the 91 # catching mechanism something is busted in cmake 2.8.5, I had to use the
92 # warning regex to catch them. 92 # warning regex to catch them.
93 if(OPENJPEG_CPPCHECK) 93 if(OPENJPEG_CPPCHECK)
94 find_package(CPPCHECK REQUIRED) 94 find_package(CPPCHECK REQUIRED)
95 foreach(f ${OPENJPEG_SRCS}) 95 foreach(f ${OPENJPEG_SRCS})
96 # cppcheck complains about too many configuration, pretend to be WIN32: 96 # cppcheck complains about too many configuration, pretend to be WIN32:
97 add_custom_command(TARGET ${OPENJPEG_LIBRARY_NAME} 97 add_custom_command(TARGET ${OPENJPEG_LIBRARY_NAME}
98 COMMAND ${CPPCHECK_EXECUTABLE} -DWIN32 ${f}) 98 COMMAND ${CPPCHECK_EXECUTABLE} -DWIN32 ${f})
99 endforeach() 99 endforeach()
100 endif() 100 endif()
101
102 if(OPJ_USE_DSYMUTIL)
103 if(BUILD_SHARED_LIBS)
104 GET_TARGET_PROPERTY(OPENJPEG_LIBRARY_LOCATION ${OPENJPEG_LIBRARY_NAME} LOCAT ION)
105 add_custom_command(TARGET ${OPENJPEG_LIBRARY_NAME} POST_BUILD
106 COMMAND "dsymutil" "${OPENJPEG_LIBRARY_LOCATION}"
107 COMMENT "dsymutil ${OPENJPEG_LIBRARY_LOCATION}"
108 DEPENDS ${OPENJPEG_LIBRARY_NAME})
109 endif()
110 endif()
OLDNEW
« no previous file with comments | « no previous file | core/src/fxcodec/fx_libopenjpeg/libopenjpeg20/j2k.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698