summaryrefslogtreecommitdiff
path: root/indra/cmake/OpenJPEG.cmake
diff options
context:
space:
mode:
Diffstat (limited to 'indra/cmake/OpenJPEG.cmake')
-rw-r--r--indra/cmake/OpenJPEG.cmake8
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake
index 5729f6a10e..125f32e711 100644
--- a/indra/cmake/OpenJPEG.cmake
+++ b/indra/cmake/OpenJPEG.cmake
@@ -1,7 +1,9 @@
# -*- cmake -*-
+include_guard()
+
include(Prebuilt)
+include(Linking)
-include_guard()
add_library( ll::openjpeg INTERFACE IMPORTED )
#use_system_binary(openjpeg)
@@ -19,7 +21,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
DESTINATION ${CMAKE_BINARY_DIR}
)
- if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
+ if (${LINUX_DISTRO} MATCHES ubuntu)
try_compile(OPENJPEG_RESULT
PROJECT OPENJPEG
SOURCE_DIR ${CMAKE_BINARY_DIR}/openjpeg-2.5.3
@@ -61,7 +63,7 @@ if (${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKIN
file(WRITE ${PREBUILD_TRACKING_DIR}/openjpeg_installed "${openjpeg_installed}")
endif ()
-if (${LINUX_DISTRO} MATCHES debian OR (${LINUX_DISTRO} MATCHES ubuntu))
+if (${LINUX_DISTRO} MATCHES ubuntu)
target_link_libraries(ll::openjpeg INTERFACE openjp2 )
else ()
include(FindPkgConfig)