projects
/
openjpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d60670
)
CMake: add missing GNUInstallDirs related substitutions (fixes #1424) (#1456)
author
autoantwort
<41973254+autoantwort@users.noreply.github.com>
Tue, 7 Feb 2023 00:08:38 +0000
(
01:08
+0100)
committer
GitHub
<noreply@github.com>
Tue, 7 Feb 2023 00:08:38 +0000
(
01:08
+0100)
src/lib/openjp2/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/lib/openjp2/CMakeLists.txt
b/src/lib/openjp2/CMakeLists.txt
index e65cb9d1a6e686ebeb5e9796b5478a083c20e1f6..f92044e8b82f0ad1b03dd30d2227a6e0a57bf363 100644
(file)
--- a/
src/lib/openjp2/CMakeLists.txt
+++ b/
src/lib/openjp2/CMakeLists.txt
@@
-98,14
+98,14
@@
else()
add_library(openjp2_static STATIC ${OPENJPEG_SRCS})
set_target_properties(openjp2_static PROPERTIES OUTPUT_NAME ${OPENJPEG_LIBRARY_NAME})
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
add_library(openjp2_static STATIC ${OPENJPEG_SRCS})
set_target_properties(openjp2_static PROPERTIES OUTPUT_NAME ${OPENJPEG_LIBRARY_NAME})
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static)
- target_include_directories(openjp2_static PUBLIC $<INSTALL_INTERFACE:${
OPENJPEG_INSTALL_INCLUDE_
DIR}>)
+ target_include_directories(openjp2_static PUBLIC $<INSTALL_INTERFACE:${
CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUB
DIR}>)
else()
add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
endif()
endif()
else()
add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME})
endif()
endif()
-target_include_directories(${OPENJPEG_LIBRARY_NAME} PUBLIC $<INSTALL_INTERFACE:${
OPENJPEG_INSTALL_INCLUDE_
DIR}>)
+target_include_directories(${OPENJPEG_LIBRARY_NAME} PUBLIC $<INSTALL_INTERFACE:${
CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUB
DIR}>)
if(UNIX)
target_link_libraries(${OPENJPEG_LIBRARY_NAME} m)
endif()
if(UNIX)
target_link_libraries(${OPENJPEG_LIBRARY_NAME} m)
endif()