From 553020c44866b3d29ded0970d3222f4889c568bc Mon Sep 17 00:00:00 2001
From: Maksim Shabunin <maksim.shabunin@itseez.com>
Date: Wed, 18 Feb 2015 12:36:50 +0300
Subject: [PATCH 1/2] Enabled STL usage within the library

---
 cmake/OpenCVModule.cmake    | 4 ----
 modules/java/CMakeLists.txt | 1 -
 modules/python/common.cmake | 1 -
 3 files changed, 6 deletions(-)

diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index 90068dede..958be3dab 100644
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -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})
diff --git a/modules/java/CMakeLists.txt b/modules/java/CMakeLists.txt
index 8eb2e8938..1d7a46786 100644
--- a/modules/java/CMakeLists.txt
+++ b/modules/java/CMakeLists.txt
@@ -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})
diff --git a/modules/python/common.cmake b/modules/python/common.cmake
index dca4e56a9..a082d0777 100644
--- a/modules/python/common.cmake
+++ b/modules/python/common.cmake
@@ -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})

From c41db69f987e3a32876f0cf85eb6ce17785926ba Mon Sep 17 00:00:00 2001
From: Maksim Shabunin <maksim.shabunin@itseez.com>
Date: Wed, 18 Feb 2015 12:44:48 +0300
Subject: [PATCH 2/2] Fixed cmake issues

---
 cmake/OpenCVModule.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake
index 958be3dab..f1c35b4c3 100644
--- a/cmake/OpenCVModule.cmake
+++ b/cmake/OpenCVModule.cmake
@@ -663,7 +663,7 @@ macro(_ocv_create_module)
   set(sub_objs "")
   set(sub_links "")
   set(cuda_objs "")
-  if (DEFINED OPENCV_MODULE_${the_module}_CHILDREN)
+  if (OPENCV_MODULE_${the_module}_CHILDREN)
     status("Complex module ${the_module}")
     foreach (m ${OPENCV_MODULE_${the_module}_CHILDREN})
       if (BUILD_${m} AND TARGET ${m}_object) # ambigous?
@@ -765,7 +765,9 @@ macro(_ocv_create_module)
   if (TARGET ${the_module}_object)
     # copy COMPILE_DEFINITIONS
     get_target_property(main_defs ${the_module} COMPILE_DEFINITIONS)
-    set_target_properties(${the_module}_object PROPERTIES COMPILE_DEFINITIONS ${main_defs})
+    if (main_defs)
+      set_target_properties(${the_module}_object PROPERTIES COMPILE_DEFINITIONS ${main_defs})
+    endif()
     # use same PCH
     if (TARGET pch_Generate_${the_module})
       add_dependencies(${the_module}_object pch_Generate_${the_module} )