From a323da6fd57c8aab01092fccb509b16199963b59 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Wed, 27 Jun 2012 12:02:31 +0000 Subject: [PATCH] Fixed some warnings and install problems on linux --- CMakeLists.txt | 1 + modules/highgui/src/window_gtk.cpp | 2 +- modules/videostab/src/motion_stabilizing.cpp | 2 +- samples/CMakeLists.txt | 10 ++++------ samples/c/CMakeLists.txt | 8 ++++---- samples/cpp/CMakeLists.txt | 10 +++++----- samples/gpu/CMakeLists.txt | 10 +++++----- samples/gpu/performance/CMakeLists.txt | 8 ++++---- 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc1c8a8..2a43c0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,7 @@ if(NOT CMAKE_TOOLCHAIN_FILE) else(NOT CMAKE_TOOLCHAIN_FILE) #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" ) + # any crosscompiling set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "Installation Directory") endif(NOT CMAKE_TOOLCHAIN_FILE) diff --git a/modules/highgui/src/window_gtk.cpp b/modules/highgui/src/window_gtk.cpp index 7b9169e..99b16d9 100644 --- a/modules/highgui/src/window_gtk.cpp +++ b/modules/highgui/src/window_gtk.cpp @@ -851,7 +851,7 @@ namespace __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; PangoFont* pangoFont; diff --git a/modules/videostab/src/motion_stabilizing.cpp b/modules/videostab/src/motion_stabilizing.cpp index be73991..c4e8c28 100644 --- a/modules/videostab/src/motion_stabilizing.cpp +++ b/modules/videostab/src/motion_stabilizing.cpp @@ -142,7 +142,7 @@ void LpMotionStabilizer::stabilize(int, const vector&, pair, Mat*) #else void LpMotionStabilizer::stabilize( - int size, const vector &motions, pair range, Mat *stabilizationMotions) + int size, const vector &motions, pair /*range*/, Mat *stabilizationMotions) { CV_Assert(model_ <= MM_AFFINE); diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index cf4d20d..505cd6e 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,13 +1,11 @@ # ---------------------------------------------------------------------------- -# CMake file for samples. See root CMakeLists.txt +# CMake file for samples. See root CMakeLists.txt # # ---------------------------------------------------------------------------- -if(NOT ANDROID) - add_subdirectory(c) - add_subdirectory(cpp) - add_subdirectory(gpu) -endif() +add_subdirectory(c) +add_subdirectory(cpp) +add_subdirectory(gpu) if(ANDROID AND BUILD_ANDROID_EXAMPLES) add_subdirectory(android) diff --git a/samples/c/CMakeLists.txt b/samples/c/CMakeLists.txt index 13672e7..8e7f290 100644 --- a/samples/c/CMakeLists.txt +++ b/samples/c/CMakeLists.txt @@ -15,7 +15,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") endif() - + ocv_include_modules(${OPENCV_C_SAMPLES_REQUIRED_DEPS}) # --------------------------------------------- @@ -42,9 +42,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) RUNTIME DESTINATION "samples/c" COMPONENT main) endif() ENDMACRO() - + file(GLOB cpp_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp *.c) - + foreach(sample_filename ${cpp_samples}) get_filename_component(sample ${sample_filename} NAME_WE) OPENCV_DEFINE_C_EXAMPLE(${sample} ${sample_filename}) @@ -54,7 +54,7 @@ endif() if (INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) install(FILES ${C_SAMPLES} - DESTINATION share/opencv/samples/c + DESTINATION share/OpenCV/samples/c PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif () diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index 3f4bb6a..c2b49a7 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -23,7 +23,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") endif() - + # --------------------------------------------- # Define executable targets # --------------------------------------------- @@ -39,7 +39,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "${name}" PROJECT_LABEL "(EXAMPLE) ${name}") - + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "samples//cpp") endif() @@ -52,9 +52,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) RUNTIME DESTINATION "samples/cpp" COMPONENT main) endif() ENDMACRO() - + file(GLOB cpp_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) - + foreach(sample_filename ${cpp_samples}) get_filename_component(sample ${sample_filename} NAME_WE) OPENCV_DEFINE_CPP_EXAMPLE(${sample} ${sample_filename}) @@ -64,7 +64,7 @@ endif() if (INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB C_SAMPLES *.c *.cpp *.jpg *.png *.data makefile.* build_all.sh *.dsp *.cmd ) install(FILES ${C_SAMPLES} - DESTINATION share/opencv/samples/cpp + DESTINATION share/OpenCV/samples/cpp PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt index c1bf36b..96cf949 100644 --- a/samples/gpu/CMakeLists.txt +++ b/samples/gpu/CMakeLists.txt @@ -8,7 +8,7 @@ ocv_check_dependencies(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS}) if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) set(project "gpu") string(TOUPPER "${project}" project_upper) - + project("${project}_samples") ocv_include_modules(${OPENCV_GPU_SAMPLES_REQUIRED_DEPS}) @@ -35,9 +35,9 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_GPU_SAMPLES_REQUIRED_DEPS}) set_target_properties(${the_target} PROPERTIES - OUTPUT_NAME "${name}_${project}" + OUTPUT_NAME "${name}_${project}" PROJECT_LABEL "(EXAMPLE_${project_upper}) ${name}") - + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "samples//${project}") endif() @@ -61,10 +61,10 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) include("performance/CMakeLists.txt") 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 ) install(FILES ${install_list} - DESTINATION share/opencv/samples/${project} + DESTINATION share/OpenCV/samples/${project} PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() diff --git a/samples/gpu/performance/CMakeLists.txt b/samples/gpu/performance/CMakeLists.txt index 6ad99a1..d775037 100644 --- a/samples/gpu/performance/CMakeLists.txt +++ b/samples/gpu/performance/CMakeLists.txt @@ -9,18 +9,18 @@ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_GPU_SAMPLES_R set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "performance_gpu" PROJECT_LABEL "(EXAMPLE_GPU) performance") - + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "samples//gpu") -endif() +endif() if(WIN32) install(TARGETS ${the_target} RUNTIME DESTINATION "samples/gpu" COMPONENT main) endif() -if(NOT WIN32) +if(INSTALL_C_EXAMPLES AND NOT WIN32) file(GLOB GPU_FILES performance/*.cpp performance/*.h) install(FILES ${GPU_FILES} - DESTINATION share/opencv/samples/gpu/performance + DESTINATION share/OpenCV/samples/gpu/performance PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) endif() -- 2.7.4