Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add self-build functionality for OpenJPEG #4642

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
feat: add self-build functionality for OpenJPEG
  • Loading branch information
InisPromise committed Feb 19, 2025
commit 62c3c123c73e4c673c66eab178fbac4ce61c5db9
Binary file not shown.
Binary file added .vs/OpenImageIO/v17/.wsuo
Binary file not shown.
75 changes: 75 additions & 0 deletions .vs/OpenImageIO/v17/DocumentLayout.backup.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\Makefile||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Makefile||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\CMakeLists.txt||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:CMakeLists.txt||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\src\\cmake\\modules\\FindOpenJPEG.cmake||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\cmake\\modules\\FindOpenJPEG.cmake||{3B902123-F8A7-4915-9F01-361F908088D0}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Makefile",
"DocumentMoniker": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\Makefile",
"RelativeDocumentMoniker": "Makefile",
"ToolTip": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\Makefile",
"RelativeToolTip": "Makefile",
"ViewState": "AgIAAD4BAAAAAAAAAAAAAIABAABPAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2025-02-19T01:05:45.554Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "FindOpenJPEG.cmake",
"DocumentMoniker": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\src\\cmake\\modules\\FindOpenJPEG.cmake",
"RelativeDocumentMoniker": "src\\cmake\\modules\\FindOpenJPEG.cmake",
"ToolTip": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\src\\cmake\\modules\\FindOpenJPEG.cmake",
"RelativeToolTip": "src\\cmake\\modules\\FindOpenJPEG.cmake",
"ViewState": "AgIAAGkAAAAAAAAAAAAAAH0AAAAeAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2025-02-19T00:37:30.908Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "CMakeLists.txt",
"DocumentMoniker": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\CMakeLists.txt",
"RelativeDocumentMoniker": "CMakeLists.txt",
"ToolTip": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\CMakeLists.txt",
"RelativeToolTip": "CMakeLists.txt",
"ViewState": "AgIAAKUAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
"WhenOpened": "2025-02-18T04:25:52.66Z",
"EditorCaption": ""
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
}
]
}
]
}
]
}
75 changes: 75 additions & 0 deletions .vs/OpenImageIO/v17/DocumentLayout.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"Version": 1,
"WorkspaceRootPath": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\",
"Documents": [
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\Makefile||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:Makefile||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\CMakeLists.txt||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:CMakeLists.txt||{3B902123-F8A7-4915-9F01-361F908088D0}"
},
{
"AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\src\\cmake\\modules\\FindOpenJPEG.cmake||{3B902123-F8A7-4915-9F01-361F908088D0}",
"RelativeMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|solutionrelative:src\\cmake\\modules\\FindOpenJPEG.cmake||{3B902123-F8A7-4915-9F01-361F908088D0}"
}
],
"DocumentGroupContainers": [
{
"Orientation": 0,
"VerticalTabListWidth": 256,
"DocumentGroups": [
{
"DockedWidth": 200,
"SelectedChildIndex": 0,
"Children": [
{
"$type": "Document",
"DocumentIndex": 0,
"Title": "Makefile",
"DocumentMoniker": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\Makefile",
"RelativeDocumentMoniker": "Makefile",
"ToolTip": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\Makefile",
"RelativeToolTip": "Makefile",
"ViewState": "AgIAAD4BAAAAAAAAAAAAAEYBAAAFAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2025-02-19T01:05:45.554Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 2,
"Title": "FindOpenJPEG.cmake",
"DocumentMoniker": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\src\\cmake\\modules\\FindOpenJPEG.cmake",
"RelativeDocumentMoniker": "src\\cmake\\modules\\FindOpenJPEG.cmake",
"ToolTip": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\src\\cmake\\modules\\FindOpenJPEG.cmake",
"RelativeToolTip": "src\\cmake\\modules\\FindOpenJPEG.cmake",
"ViewState": "AgIAAGkAAAAAAAAAAAAAAH0AAAAeAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001001|",
"WhenOpened": "2025-02-19T00:37:30.908Z",
"EditorCaption": ""
},
{
"$type": "Document",
"DocumentIndex": 1,
"Title": "CMakeLists.txt",
"DocumentMoniker": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\CMakeLists.txt",
"RelativeDocumentMoniker": "CMakeLists.txt",
"ToolTip": "C:\\Users\\liben\\OpenSourceContributions\\OpenImageIO\\CMakeLists.txt",
"RelativeToolTip": "CMakeLists.txt",
"ViewState": "AgIAAKUAAAAAAAAAAAAAAOQAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.003109|",
"WhenOpened": "2025-02-18T04:25:52.66Z",
"EditorCaption": ""
},
{
"$type": "Bookmark",
"Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
}
]
}
]
}
]
}
9 changes: 9 additions & 0 deletions .vs/VSWorkspaceState.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"ExpandedNodes": [
"",
"\\src\\cmake",
"\\src\\cmake\\modules"
],
"SelectedNode": "\\CMakeLists.txt",
"PreviewInSolutionExplorer": false
}
Binary file added .vs/slnx.sqlite
Binary file not shown.
6 changes: 6 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,12 @@ include (externalpackages)

include (cuda_macros)

#self-building functionality for OpenJPEG
find_package(OpenJPEG REQUIRED)
target_link_libraries(build PRIVATE ${OpenJPEG_LIBRARIES})
include_directories(${OpenJPEG}_INCLUDE_DIRS)


# Include all our testing apparatus and utils, but not if it's a subproject
if (PROJECT_IS_TOP_LEVEL)
include (testing)
Expand Down