Commit a323da6f authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed some warnings and install problems on linux

parent 981564ff
...@@ -37,6 +37,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE) ...@@ -37,6 +37,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE)
else(NOT CMAKE_TOOLCHAIN_FILE) else(NOT CMAKE_TOOLCHAIN_FILE)
#Android: set output folder to ${CMAKE_BINARY_DIR} #Android: set output folder to ${CMAKE_BINARY_DIR}
set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to" ) set( LIBRARY_OUTPUT_PATH_ROOT ${CMAKE_BINARY_DIR} CACHE PATH "root for library output, set this to change where android libs are compiled to" )
# any crosscompiling
set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory")
endif(NOT CMAKE_TOOLCHAIN_FILE) endif(NOT CMAKE_TOOLCHAIN_FILE)
......
...@@ -851,7 +851,7 @@ namespace ...@@ -851,7 +851,7 @@ namespace
__END__; __END__;
} }
void GlFuncTab_GTK::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool underline, int start, int count, int base) const void GlFuncTab_GTK::generateBitmapFont(const std::string& family, int height, int weight, bool italic, bool /*underline*/, int start, int count, int base) const
{ {
PangoFontDescription* fontDecr; PangoFontDescription* fontDecr;
PangoFont* pangoFont; PangoFont* pangoFont;
......
...@@ -142,7 +142,7 @@ void LpMotionStabilizer::stabilize(int, const vector<Mat>&, pair<int,int>, Mat*) ...@@ -142,7 +142,7 @@ void LpMotionStabilizer::stabilize(int, const vector<Mat>&, pair<int,int>, Mat*)
#else #else
void LpMotionStabilizer::stabilize( void LpMotionStabilizer::stabilize(
int size, const vector<Mat> &motions, pair<int,int> range, Mat *stabilizationMotions) int size, const vector<Mat> &motions, pair<int,int> /*range*/, Mat *stabilizationMotions)
{ {
CV_Assert(model_ <= MM_AFFINE); CV_Assert(model_ <= MM_AFFINE);
......
...@@ -3,11 +3,9 @@ ...@@ -3,11 +3,9 @@
# #
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
if(NOT ANDROID) add_subdirectory(c)
add_subdirectory(c) add_subdirectory(cpp)
add_subdirectory(cpp) add_subdirectory(gpu)
add_subdirectory(gpu)
endif()
if(ANDROID AND BUILD_ANDROID_EXAMPLES) if(ANDROID AND BUILD_ANDROID_EXAMPLES)
add_subdirectory(android) add_subdirectory(android)
......
...@@ -54,7 +54,7 @@ endif() ...@@ -54,7 +54,7 @@ endif()
if (INSTALL_C_EXAMPLES AND NOT WIN32) if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${C_SAMPLES} install(FILES ${C_SAMPLES}
DESTINATION share/opencv/samples/c DESTINATION share/OpenCV/samples/c
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif () endif ()
...@@ -64,7 +64,7 @@ endif() ...@@ -64,7 +64,7 @@ endif()
if (INSTALL_C_EXAMPLES AND NOT WIN32) if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${C_SAMPLES} install(FILES ${C_SAMPLES}
DESTINATION share/opencv/samples/cpp DESTINATION share/OpenCV/samples/cpp
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif() endif()
...@@ -61,10 +61,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ...@@ -61,10 +61,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
include("performance/CMakeLists.txt") include("performance/CMakeLists.txt")
endif() endif()
if (NOT WIN32) if (INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) file(GLOB install_list *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd )
install(FILES ${install_list} install(FILES ${install_list}
DESTINATION share/opencv/samples/${project} DESTINATION share/OpenCV/samples/${project}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif() endif()
...@@ -18,9 +18,9 @@ if(WIN32) ...@@ -18,9 +18,9 @@ if(WIN32)
install(TARGETS ${the_target} RUNTIME DESTINATION "samples/gpu" COMPONENT main) install(TARGETS ${the_target} RUNTIME DESTINATION "samples/gpu" COMPONENT main)
endif() endif()
if(NOT WIN32) if(INSTALL_C_EXAMPLES AND NOT WIN32)
file(GLOB GPU_FILES performance/*.cpp performance/*.h) file(GLOB GPU_FILES performance/*.cpp performance/*.h)
install(FILES ${GPU_FILES} install(FILES ${GPU_FILES}
DESTINATION share/opencv/samples/gpu/performance DESTINATION share/OpenCV/samples/gpu/performance
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
endif() endif()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment