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

[trunk] Fix installation issues. Thanks to winfried for patch. 

Fixes issue 149
This commit is contained in:
Mathieu Malaterre 2012-05-29 13:44:27 +00:00
parent b8cc257ac5
commit 806545df34
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -218,7 +218,9 @@ CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
"${OPENJPEG_BINARY_DIR}/opj_config.h" "${OPENJPEG_BINARY_DIR}/opj_config.h"
@ONLY @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) # 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)

2
libopenjpeg/CMakeLists.txt
View File

@ -55,7 +55,7 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
) )
# Install includes files # Install includes files
INSTALL(FILES openjpeg.h INSTALL(FILES openjpeg.h opj_stdint.h
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
) )

8
libopenjpeg/Makefile.am
View File

@ -7,7 +7,7 @@ SUBDIRS += jpwl
endif endif
includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR) includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)
includes_HEADERS = openjpeg.h opj_stdint.h includes_HEADERS = openjpeg.h opj_stdint.h $(top_builddir)/opj_config.h
lib_LTLIBRARIES = libopenjpeg.la lib_LTLIBRARIES = libopenjpeg.la
@ -75,10 +75,7 @@ EXTRA_DIST = \
CMakeLists.txt CMakeLists.txt
install-data-hook: install-data-hook:
cd $(DESTDIR)$(includedir) && \ cd $(DESTDIR)$(includedir) && rm -f openjpeg.h
rm -f openjpeg.h && \
$(LN_S) openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h \
openjpeg.h
@rm -rf $(top_builddir)/report.txt @rm -rf $(top_builddir)/report.txt
@echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt @echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
if BUILD_SHARED if BUILD_SHARED
@ -88,7 +85,6 @@ if BUILD_STATIC
@echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
endif endif
@echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt @echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt
@echo -e " (LN)\t$(includedir)/openjpeg.h" >> $(top_builddir)/report.txt
uninstall-hook: uninstall-hook:
rm -f $(DESTDIR)$(includedir)/openjpeg.h rm -f $(DESTDIR)$(includedir)/openjpeg.h