diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-05-28 17:40:27 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-05-28 17:40:27 +0800 |
| commit | 5c651c1f90be1059fe059dba7bab5c69d211206e (patch) | |
| tree | b86c995b3b91c50a527cac299fae3faee6e6bb17 /indra | |
| parent | e396c4640d7d41711b013839d993a6fa80483526 (diff) | |
Revert "Use prebuilt OpenJPEG for now"
This reverts commit 0797257992ee7f88456d3083ebf214485b75c139.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/OpenJPEG.cmake | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/cmake/OpenJPEG.cmake b/indra/cmake/OpenJPEG.cmake index 6fa4cad9c2..87c59ad5ae 100644 --- a/indra/cmake/OpenJPEG.cmake +++ b/indra/cmake/OpenJPEG.cmake @@ -4,17 +4,17 @@ include(Prebuilt) include_guard() add_library( ll::openjpeg INTERFACE IMPORTED ) -#if (USESYSTEMLIBS) -# include(FindPkgConfig) -# pkg_check_modules(Openjpeg REQUIRED libopenjp2) -# target_include_directories(ll::openjpeg SYSTEM INTERFACE ${Openjpeg_INCLUDE_DIRS}) -# target_link_directories(ll::openjpeg INTERFACE ${Openjpeg_LIBRARY_DIRS}) -# target_link_libraries(ll::openjpeg INTERFACE ${Openjpeg_LIBRARIES}) -# return () -#endif () +if (NOT (USE_AUTOBUILD_3P OR USE_CONAN)) + include(FindPkgConfig) + pkg_check_modules(Openjpeg REQUIRED libopenjp2) + target_include_directories(ll::openjpeg SYSTEM INTERFACE ${Openjpeg_INCLUDE_DIRS}) + target_link_directories(ll::openjpeg INTERFACE ${Openjpeg_LIBRARY_DIRS}) + target_link_libraries(ll::openjpeg INTERFACE ${Openjpeg_LIBRARIES}) + return () +endif () -#use_system_binary(openjpeg) -#use_prebuilt_binary(openjpeg) +use_system_binary(openjpeg) +use_prebuilt_binary(openjpeg) target_link_libraries(ll::openjpeg INTERFACE openjp2 ) target_include_directories( ll::openjpeg SYSTEM INTERFACE ${LIBS_PREBUILT_DIR}/include) |