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
553020c4
Commit
553020c4
authored
Feb 18, 2015
by
Maksim Shabunin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Enabled STL usage within the library
parent
d1a15097
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
6 deletions
+0
-6
OpenCVModule.cmake
cmake/OpenCVModule.cmake
+0
-4
CMakeLists.txt
modules/java/CMakeLists.txt
+0
-1
common.cmake
modules/python/common.cmake
+0
-1
No files found.
cmake/OpenCVModule.cmake
View file @
553020c4
...
...
@@ -697,10 +697,6 @@ macro(_ocv_create_module)
unset
(
sub_links
)
unset
(
cuda_objs
)
if
(
NOT the_module STREQUAL opencv_ts
)
set_target_properties
(
${
the_module
}
PROPERTIES COMPILE_DEFINITIONS OPENCV_NOSTL
)
endif
()
ocv_target_link_libraries
(
${
the_module
}
${
OPENCV_MODULE_
${
the_module
}
_DEPS_TO_LINK
}
)
ocv_target_link_libraries
(
${
the_module
}
LINK_INTERFACE_LIBRARIES
${
OPENCV_MODULE_
${
the_module
}
_DEPS_TO_LINK
}
)
ocv_target_link_libraries
(
${
the_module
}
${
OPENCV_MODULE_
${
the_module
}
_DEPS_EXT
}
${
OPENCV_LINKER_LIBS
}
${
IPP_LIBS
}
${
ARGN
}
)
...
...
modules/java/CMakeLists.txt
View file @
553020c4
...
...
@@ -253,7 +253,6 @@ string(REPLACE "-fvisibility=hidden" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
ocv_add_library
(
${
the_module
}
SHARED
${
handwrittren_h_sources
}
${
handwrittren_cpp_sources
}
${
generated_cpp_sources
}
${
copied_files
}
"
${
JAR_FILE
}
"
"
${
JAR_FILE
}
.dephelper"
)
set_target_properties
(
${
the_module
}
PROPERTIES COMPILE_DEFINITIONS OPENCV_NOSTL
)
if
(
BUILD_FAT_JAVA_LIB
)
set
(
__deps
${
OPENCV_MODULE_
${
the_module
}
_DEPS
}
${
OPENCV_MODULES_BUILD
}
)
...
...
modules/python/common.cmake
View file @
553020c4
...
...
@@ -58,7 +58,6 @@ add_custom_command(
DEPENDS
${
opencv_hdrs
}
)
ocv_add_library
(
${
the_module
}
SHARED
${
PYTHON_SOURCE_DIR
}
/src2/cv2.cpp
${
cv2_generated_hdrs
}
)
set_target_properties
(
${
the_module
}
PROPERTIES COMPILE_DEFINITIONS OPENCV_NOSTL
)
if
(
PYTHON_DEBUG_LIBRARIES AND NOT PYTHON_LIBRARIES MATCHES
"optimized.*debug"
)
ocv_target_link_libraries
(
${
the_module
}
debug
${
PYTHON_DEBUG_LIBRARIES
}
optimized
${
PYTHON_LIBRARIES
}
)
...
...
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