From c11bc13126c7867640305d9421a0c1e6ad0477c9 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Thu, 10 Jun 2010 23:38:37 +0000 Subject: [PATCH] minor fixes in CMake scripts --- CMakeLists.txt | 3 +++ modules/traincascade/CMakeLists.txt | 17 +++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ac6c55970..cd3cb6b1a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1239,6 +1239,9 @@ else() message(STATUS " Use TBB: NO") endif() +message(STATUS "") +message(STATUS " Documentation: ") + if(BUILD_LATEX_DOCS AND PDFLATEX_COMPILER) message(STATUS " Build PDF YES") else() diff --git a/modules/traincascade/CMakeLists.txt b/modules/traincascade/CMakeLists.txt index 1321b25a64..1a963a0897 100644 --- a/modules/traincascade/CMakeLists.txt +++ b/modules/traincascade/CMakeLists.txt @@ -13,8 +13,8 @@ include_directories( "${CMAKE_SOURCE_DIR}/modules/legacy/include" ) -set(traincascade_libs opencv_core opencv_ml opencv_imgproc opencv_objdetect opencv_highgui opencv_haartraining_engine) -link_libraries(${traincascade_libs}) +set(traincascade_libs opencv_core opencv_ml opencv_imgproc + opencv_objdetect opencv_highgui opencv_haartraining_engine) set(traincascade_files traincascade.cpp cascadeclassifier.cpp cascadeclassifier.h @@ -22,14 +22,15 @@ set(traincascade_files traincascade.cpp haarfeatures.cpp haarfeatures.h lbpfeatures.cpp lbpfeatures.h imagestorage.cpp imagestorage.h) - -add_executable(traincascade ${traincascade_files}) -add_dependencies(traincascade ${traincascade_libs}) -set_target_properties(traincascade PROPERTIES +set(the_target opencv_traincascade) +add_executable(${the_target} ${traincascade_files}) + +add_dependencies(${the_target} ${traincascade_libs}) +set_target_properties(${the_target} PROPERTIES DEBUG_POSTFIX "${OPENCV_DEBUG_POSTFIX}" OUTPUT_NAME "opencv_traincascade") -target_link_libraries(traincascade ${traincascade_libs}) +target_link_libraries(${the_target} ${traincascade_libs}) -install(TARGETS traincascade RUNTIME DESTINATION bin COMPONENT main) +install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main)