blackbeard420/notcurses
1
0
Fork 0
mirror of https://github.com/dankamongmen/notcurses synced 2025-03-10 01:29:05 -04:00
Code Issues Projects Releases Wiki Activity

Revert "[CMake] use OIIO's cmake module"

Browse Source 
OIIO CMake is broken on MSYS2: https://github.com/msys2/MSYS2-packages/issues/2720
This reverts commit ecc7ac9224da5c9246a533d1928ff9a9af58dd2b.
This commit is contained in:
nick black 2021-12-04 10:50:29 -05:00
parent ecc7ac9224
commit 59e3e00e3d
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -106,7 +106,7 @@ pkg_check_modules(AVUTIL REQUIRED libavutil>=56.0)
pkg_check_modules(SWSCALE REQUIRED libswscale>=5.0) pkg_check_modules(SWSCALE REQUIRED libswscale>=5.0)
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND FFMpeg) set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND FFMpeg)
elseif(${USE_OIIO}) elseif(${USE_OIIO})
find_package(OpenImageIO 2.1 REQUIRED) pkg_check_modules(OIIO REQUIRED OpenImageIO>=2.1)
set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND OpenImageIO) set_property(GLOBAL APPEND PROPERTY PACKAGES_FOUND OpenImageIO)
endif() endif()
endif() endif()
@ -384,12 +384,12 @@ target_link_directories(notcurses-static
"${AVUTIL_STATIC_LIBRARY_DIRS}" "${AVUTIL_STATIC_LIBRARY_DIRS}"
) )
elseif(${USE_OIIO}) elseif(${USE_OIIO})
target_include_directories(notcurses PUBLIC "${OPENIMAGEIO_INCLUDE_DIRS}") target_include_directories(notcurses PUBLIC "${OIIO_INCLUDE_DIRS}")
target_include_directories(notcurses-static PUBLIC "${OPENIMAGEIO_STATIC_INCLUDE_DIRS}") target_include_directories(notcurses-static PUBLIC "${OIIO_STATIC_INCLUDE_DIRS}")
target_link_libraries(notcurses PRIVATE OpenImageIO) target_link_libraries(notcurses PRIVATE ${OIIO_LIBRARIES})
target_link_libraries(notcurses-static PRIVATE ${OPENIMAGEIO_STATIC_LIBRARY}) target_link_libraries(notcurses-static PRIVATE ${OIIO_STATIC_LIBRARIES})
target_link_directories(notcurses PRIVATE ${OPENIMAGEIO_LIBRARY_DIRS}) target_link_directories(notcurses PRIVATE ${OIIO_LIBRARY_DIRS})
target_link_directories(notcurses-static PRIVATE ${OPENIMAGEIO_STATIC_LIBRARY_DIRS}) target_link_directories(notcurses-static PRIVATE ${OIIO_STATIC_LIBRARY_DIRS})
endif() endif()
############################################################################ ############################################################################