Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Youssefi
otb
Commits
72258dae
Commit
72258dae
authored
13 years ago
by
Julien Malik
Browse files
Options
Downloads
Patches
Plain Diff
ENH: do not install internal remangled openjpeg headers
parent
c1267e53
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Utilities/otbopenjpeg/CMakeLists.txt
+15
-28
15 additions, 28 deletions
Utilities/otbopenjpeg/CMakeLists.txt
Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
+13
-13
13 additions, 13 deletions
Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
with
28 additions
and
41 deletions
Utilities/otbopenjpeg/CMakeLists.txt
+
15
−
28
View file @
72258dae
...
...
@@ -160,9 +160,9 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/openjpeg_mangle_private.h.cmake.in
#-----------------------------------------------------------------------------
# pkgconfig support
CONFIGURE_FILE
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/libopenjpeg1.pc.cmake
${
CMAKE_CURRENT_BINARY_DIR
}
/libopenjpeg1.pc @ONLY
)
INSTALL
(
FILES
${
CMAKE_CURRENT_BINARY_DIR
}
/libopenjpeg1.pc DESTINATION
${
OPENJPEG_INSTALL_LIB_DIR
}
/pkgconfig
)
INSTALL
(
CODE
"EXECUTE_PROCESS(COMMAND
${
CMAKE_COMMAND
}
-E create_symlink
\"
libopenjpeg1.pc
\"
\"\$
ENV{DESTDIR}
${
OPENJPEG_INSTALL_LIB_DIR
}
/pkgconfig/libopenjpeg.pc
\"
)"
)
#
INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
#
INSTALL( CODE
#
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
#-----------------------------------------------------------------------------
# Compiler specific flags:
...
...
@@ -284,31 +284,18 @@ ENDIF(BUILD_TESTING)
#-----------------------------------------------------------------------------
# install all targets referenced as OPENJPEGTargets
INSTALL
(
EXPORT OpenJPEGTargets DESTINATION
${
OPENJPEG_INSTALL_PACKAGE_DIR
}
)
CONFIGURE_FILE
(
${
OPENJPEG_SOURCE_DIR
}
/CMake/OpenJPEGConfig.cmake.in
${
OPENJPEG_BINARY_DIR
}
/OpenJPEGConfig.cmake
@ONLY
)
INSTALL
(
FILES
${
OPENJPEG_BINARY_DIR
}
/OpenJPEGConfig.cmake
DESTINATION
${
OPENJPEG_INSTALL_PACKAGE_DIR
}
)
#
INSTALL(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
#
CONFIGURE_FILE( ${OPENJPEG_SOURCE_DIR}/CMake/OpenJPEGConfig.cmake.in
#
${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
#
@ONLY
#
)
#
INSTALL( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
#
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
#
)
#-----------------------------------------------------------------------------
# install CHANGES and LICENSE
INSTALL
(
FILES CHANGES
LICENSE
DESTINATION
${
OPENJPEG_INSTALL_DOC_DIR
}
)
#-----------------------------------------------------------------------------
# otb added
IF
(
NOT OTB_INSTALL_NO_DEVELOPMENT
)
# Install OTB specifics includes files
INSTALL
(
FILES otb_openjpeg.h otb_openjpeg_mangle.h
DESTINATION
${
OTB_INSTALL_INCLUDE_DIR_CM24
}
/Utilities/otbopenjpeg
COMPONENT Development
)
ENDIF
(
NOT OTB_INSTALL_NO_DEVELOPMENT
)
#INSTALL(
# FILES CHANGES
# LICENSE
# DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
This diff is collapsed.
Click to expand it.
Utilities/otbopenjpeg/libopenjpeg/CMakeLists.txt
+
13
−
13
View file @
72258dae
...
...
@@ -53,21 +53,21 @@ INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
)
# Install includes files
INSTALL
(
FILES openjpeg.h
DESTINATION
${
OPENJPEG_INSTALL_INCLUDE_DIR
}
/
${
OPENJPEG_INSTALL_SUBDIR
}
COMPONENT Headers
)
INSTALL
(
CODE
"EXECUTE_PROCESS(COMMAND
${
CMAKE_COMMAND
}
-E create_symlink
${
OPENJPEG_INSTALL_SUBDIR
}
/openjpeg.h
\$
ENV{DESTDIR}
\$
{CMAKE_INSTALL_PREFIX}/
${
OPENJPEG_INSTALL_INCLUDE_DIR
}
/openjpeg.h)"
)
#
INSTALL(FILES openjpeg.h
#
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
#
)
#
INSTALL(CODE
#
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)")
INSTALL
(
FILES
${
OPENJPEG_BINARY_DIR
}
/openjpeg_mangle.h
DESTINATION
${
OPENJPEG_INSTALL_INCLUDE_DIR
}
/
${
OPENJPEG_INSTALL_SUBDIR
}
COMPONENT Headers
)
INSTALL
(
CODE
"EXECUTE_PROCESS(COMMAND
${
CMAKE_COMMAND
}
-E create_symlink
${
OPENJPEG_INSTALL_SUBDIR
}
/openjpeg_mangle.h
\$
ENV{DESTDIR}
\$
{CMAKE_INSTALL_PREFIX}/
${
OPENJPEG_INSTALL_INCLUDE_DIR
}
/openjpeg_mangle.h)"
)
#
INSTALL(FILES ${OPENJPEG_BINARY_DIR}/openjpeg_mangle.h
#
DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
#
)
#
INSTALL(CODE
#
"EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${OPENJPEG_INSTALL_SUBDIR}/openjpeg_mangle.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg_mangle.h)")
# install man page of the library
INSTALL
(
FILES
${
OPENJPEG_SOURCE_DIR
}
/doc/man/man3/libopenjpeg.3
DESTINATION
${
OPENJPEG_INSTALL_MAN_DIR
}
/man3
)
#
INSTALL(
#
FILES ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjpeg.3
#
DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment