Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
95c8daa1
Commit
95c8daa1
authored
Nov 11, 2019
by
Wieland Morgenstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apple: link to VS_LIB_DEFAULT if USE_DELAY_LOAD is disabled
parent
d35604e4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
CMakeLists.txt
CMakeLists.txt
+8
-2
CMakeLists.txt
IO/src/av/CMakeLists.txt
+5
-1
No files found.
CMakeLists.txt
View file @
95c8daa1
...
...
@@ -432,7 +432,7 @@ else()
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=
${
CMAKE_RUNTIME_OUTPUT_DIRECTORY_
${
OUTPUTCONFIG_UP
}}
-P
${
CMAKE_SOURCE_DIR
}
/lib/generateFakeLibvideostitch.cmake
DEPENDS
${
VS_LIB_DEFAULT
}
)
if
(
USE_DELAY_LOAD
)
if
(
USE_DELAY_LOAD
AND MSVC
)
add_dependencies
(
generateFakeLibvideostitch_
${
OUTPUTCONFIG_UP
}
${
VS_LIB_FAKE
}
)
endif
()
endforeach
()
...
...
@@ -463,7 +463,13 @@ function(link_target_to_libvideostitch TARGET_NAME)
set_target_properties
(
${
TARGET_NAME
}
PROPERTIES LINK_FLAGS
${
new_link_flags
}
)
endif
()
elseif
(
APPLE
)
if
(
USE_DELAY_LOAD
)
target_link_libraries
(
${
TARGET_NAME
}
PRIVATE
${
VS_LIB_FAKE
}
)
else
()
target_link_libraries
(
${
TARGET_NAME
}
PRIVATE
${
VS_LIB_DEFAULT
}
)
endif
()
# ensure the non-fake backend libs are built
if
(
GPU_BACKEND_CUDA
)
add_dependencies
(
${
TARGET_NAME
}
${
VS_LIB_CUDA
}
)
...
...
IO/src/av/CMakeLists.txt
View file @
95c8daa1
...
...
@@ -79,10 +79,14 @@ function(setup_av_plugin PLUGIN_NAME BACKEND_NAME USE_CUDA)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
libmfxhw64
}
${
DirectX_LIB
}
)
set_property
(
TARGET
${
PLUGIN_NAME
}
APPEND_STRING PROPERTY LINK_FLAGS
"/NODEFAULTLIB:libcmt /NODEFAULTLIB:libcmtd"
)
elseif
(
APPLE
)
if
(
USE_DELAY_LOAD
)
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
VS_LIB_FAKE
}
)
else
()
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
VS_LIB_DEFAULT
}
)
endif
()
else
()
target_link_libraries
(
${
PLUGIN_NAME
}
PRIVATE
${
VS_LIB_DEFAULT
}
)
endif
()
# Unit tests
if
(
NOT WINDOWS
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment