Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
6b31f580
Commit
6b31f580
authored
Mar 01, 2019
by
smirnov-alexey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modifies standalone G-API cmake for testing it properly
parent
abfcb601
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
1 deletion
+11
-1
CMakeLists.txt
modules/gapi/CMakeLists.txt
+1
-0
standalone.cmake
modules/gapi/cmake/standalone.cmake
+10
-1
No files found.
modules/gapi/CMakeLists.txt
View file @
6b31f580
# FIXME: Rework standalone build in more generic maner
# (Restructure directories, add common pass, etc)
if
(
NOT DEFINED OPENCV_INITIAL_PASS
)
cmake_minimum_required
(
VERSION 3.3
)
include
(
"cmake/standalone.cmake"
)
return
()
endif
()
...
...
modules/gapi/cmake/standalone.cmake
View file @
6b31f580
if
(
"
${
CMAKE_BUILD_TYPE
}
"
STREQUAL
""
)
set
(
CMAKE_BUILD_TYPE
"Release"
)
endif
()
if
(
NOT TARGET ade
)
find_package
(
ade 0.1.0 REQUIRED
)
endif
()
...
...
@@ -23,7 +27,7 @@ target_include_directories(${FLUID_TARGET}
PUBLIC $<BUILD_INTERFACE:
${
FLUID_ROOT
}
/include>
PRIVATE
${
FLUID_ROOT
}
/src
)
target_compile_definitions
(
${
FLUID_TARGET
}
PUBLIC
-D
GAPI_STANDALONE
target_compile_definitions
(
${
FLUID_TARGET
}
PUBLIC GAPI_STANDALONE
# This preprocessor definition resolves symbol clash when
# standalone fluid meets gapi ocv module in one application
PUBLIC cv=fluidcv
)
...
...
@@ -31,4 +35,9 @@ target_compile_definitions(${FLUID_TARGET} PUBLIC -DGAPI_STANDALONE
set_target_properties
(
${
FLUID_TARGET
}
PROPERTIES POSITION_INDEPENDENT_CODE True
)
set_property
(
TARGET
${
FLUID_TARGET
}
PROPERTY CXX_STANDARD 11
)
if
(
MSVC
)
target_compile_options
(
${
FLUID_TARGET
}
PUBLIC
"/wd4251"
)
target_compile_definitions
(
${
FLUID_TARGET
}
PRIVATE _CRT_SECURE_NO_DEPRECATE
)
endif
()
target_link_libraries
(
${
FLUID_TARGET
}
PRIVATE ade
)
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