added more compiler lookups from opencv cmake to nice cmake (more rigit warning handlings

CMakeLists.txt

@@ -3,6 +3,11 @@ project (NICELibrary)
 
 include(CheckSymbolExists)
 
+include(cmake/OpenCVUtils.cmake REQUIRED)
+include(cmake/OpenCVDetectCXXCompiler.cmake REQUIRED)
+include(cmake/NiceModules.cmake REQUIRED)
+include(cmake/OpenCVCompilerOptions.cmake REQUIRED)
+
 # The version number.
 set(NICELibrary_VERSION_MAJOR 1)
 set(NICELibrary_VERSION_MINOR 0)
@@ -37,6 +42,8 @@ if (PNG_FOUND)
   ADD_DEFINITIONS( "-DNICE_USELIB_PNG")
 endif()
 
+FIND_PACKAGE(Qt4)
+
 #find_package(ImageMagick COMPONENTS Magick++)
 #if(ImageMagick_FOUND)
 #  INCLUDE_DIRECTORIES(${ImageMagick_INCLUDE_DIRS})
@@ -53,8 +60,6 @@ endif()
 #SET(CMAKE_USE_RELATIVE_PATHS ON)
 #check_symbol_exists("__assert_fail" "assert.h" HAVE_ASSERT_FAIL)
 
-include(cmake/OpenCVUtils.cmake REQUIRE)
-include(cmake/NiceModules.cmake REQUIRE)
 
 set(OPENCV_LIB_INSTALL_PATH lib)
 

core/vector/CMakeLists.txt

@@ -1,7 +1,46 @@
 ocv_add_module(vector)
 
+
+ocv_clear_vars(ADDITIONAL_CORE_VECTOR_LIBS)
+
+if(OPENMP_FOUND)#NICE_USELIB_OPENMP
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+  ADD_DEFINITIONS( "-DNICE_USELIB_OPENMP" )
+  ocv_include_directories(${OpenMP_INCLUDE_DIR})
+  #list(APPEND ADDITIONAL_CORE_VECTOR_LIBS ${PNG_LIBRARIES})
+endif()
+
+if(IPP_FOUND) #NICE_USELIB_IPP
+endif()
+
+if(LINAL_FOUND) #NICE_USELIB_LINAL
+endif()
+
+if(ZLIB_FOUND)#NICE_USELIB_ZLIB
+endif()
+
+if(BZLIB_FOUND)#NICE_USELIB_BZLIB //in test/TestSTreamable.cpp
+endif()
+
+if(CPPUNIT_FOUND)#NICE_USELIB_CPPUNIT
+endif()
+
 ocv_module_include_directories()
 ocv_glob_module_sources()
-ocv_create_module()
 
-#add_subdirectory(progs bin)
+#ocv_create_module(  ) 
+
+ocv_create_module(${ADDITIONAL_CORE_VECTOR_LIBS})
+
+if(MSVC)
+  if(NOT ENABLE_NOISY_WARNINGS)
+    ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4996)
+  endif()
+endif()
+#add_subdirectory(progs bin)
+
+
+
+
+

readme.txt

@@ -71,6 +71,9 @@ NICE_USELIB_CUDACHOLESKY
 NICE_USELIB_IPP
 NICE_USELIB_OPENMP
 #ifdef NICE_USELIB_MATIO
+NICE_USELIB_PNG
+NICE_USELIB_JPG
+NICE_USELIB_LIBMAGICK
 
 #eigene definiton zum builden der sub-test-ordners
 NICE_BUILD_TESTS