From 69f28ef65c588aedf9e9783579e32c4044594239 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Tue, 17 May 2011 09:40:06 +0000 Subject: [PATCH] solution folder flag disabled by default --- 3rdparty/libjasper/CMakeLists.txt | 2 +- 3rdparty/libjpeg/CMakeLists.txt | 2 +- 3rdparty/libpng/CMakeLists.txt | 2 +- 3rdparty/libtiff/CMakeLists.txt | 2 +- 3rdparty/zlib/CMakeLists.txt | 2 +- CMakeLists.txt | 4 ++-- modules/ffmpeg/CMakeLists.txt | 2 +- modules/gpu/CMakeLists.txt | 4 ++-- modules/gpu/CMakeLists.txt_cuda32 | 4 ++-- modules/gpu/CMakeLists.txt_cuda4.0 | 4 ++-- modules/haartraining/CMakeLists.txt | 2 +- modules/highgui/CMakeLists.txt | 2 +- modules/stitching/CMakeLists.txt | 2 +- modules/traincascade/CMakeLists.txt | 2 +- samples/c/CMakeLists.txt | 2 +- samples/cpp/CMakeLists.txt | 2 +- samples/gpu/CMakeLists.txt | 2 +- samples/gpu/performance/CMakeLists.txt | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/3rdparty/libjasper/CMakeLists.txt b/3rdparty/libjasper/CMakeLists.txt index 0fed7850e..4a5a2faf4 100644 --- a/3rdparty/libjasper/CMakeLists.txt +++ b/3rdparty/libjasper/CMakeLists.txt @@ -48,7 +48,7 @@ set_target_properties(${the_target} ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") endif() diff --git a/3rdparty/libjpeg/CMakeLists.txt b/3rdparty/libjpeg/CMakeLists.txt index 8ef346325..c78bfc369 100644 --- a/3rdparty/libjpeg/CMakeLists.txt +++ b/3rdparty/libjpeg/CMakeLists.txt @@ -40,7 +40,7 @@ set_target_properties(${the_target} ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/3rdparty/lib ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") endif() diff --git a/3rdparty/libpng/CMakeLists.txt b/3rdparty/libpng/CMakeLists.txt index 50c8a86df..4eda13500 100644 --- a/3rdparty/libpng/CMakeLists.txt +++ b/3rdparty/libpng/CMakeLists.txt @@ -41,7 +41,7 @@ set_target_properties(${the_target} ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") endif() diff --git a/3rdparty/libtiff/CMakeLists.txt b/3rdparty/libtiff/CMakeLists.txt index 0fef3a1b2..899ff987f 100644 --- a/3rdparty/libtiff/CMakeLists.txt +++ b/3rdparty/libtiff/CMakeLists.txt @@ -95,7 +95,7 @@ set_target_properties(${the_target} ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib/" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") endif() diff --git a/3rdparty/zlib/CMakeLists.txt b/3rdparty/zlib/CMakeLists.txt index 4fdccd933..1fc3c5d14 100644 --- a/3rdparty/zlib/CMakeLists.txt +++ b/3rdparty/zlib/CMakeLists.txt @@ -32,7 +32,7 @@ set_target_properties(${the_target} ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 1de7c2c9d..c3a35c937 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1275,8 +1275,8 @@ endif() if(${CMAKE_VERSION} VERSION_GREATER "2.8.0") set_property(GLOBAL PROPERTY USE_FOLDERS ON) - set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets") - set(SOLUTION_FOLDERS_ENABLED 1) + set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets") + set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs") endif() #----------------------------------- diff --git a/modules/ffmpeg/CMakeLists.txt b/modules/ffmpeg/CMakeLists.txt index 8f57c097d..4ea2ffcf1 100644 --- a/modules/ffmpeg/CMakeLists.txt +++ b/modules/ffmpeg/CMakeLists.txt @@ -47,7 +47,7 @@ set_target_properties(${the_target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "modules") endif() diff --git a/modules/gpu/CMakeLists.txt b/modules/gpu/CMakeLists.txt index b17d64006..3cddd4116 100644 --- a/modules/gpu/CMakeLists.txt +++ b/modules/gpu/CMakeLists.txt @@ -104,7 +104,7 @@ set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "modules") endif() @@ -217,7 +217,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test) RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" ) - if(SOLUTION_FOLDERS_ENABLED) + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_test_target} PROPERTIES FOLDER "tests") endif() diff --git a/modules/gpu/CMakeLists.txt_cuda32 b/modules/gpu/CMakeLists.txt_cuda32 index b17d64006..3cddd4116 100644 --- a/modules/gpu/CMakeLists.txt_cuda32 +++ b/modules/gpu/CMakeLists.txt_cuda32 @@ -104,7 +104,7 @@ set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "modules") endif() @@ -217,7 +217,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test) RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" ) - if(SOLUTION_FOLDERS_ENABLED) + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_test_target} PROPERTIES FOLDER "tests") endif() diff --git a/modules/gpu/CMakeLists.txt_cuda4.0 b/modules/gpu/CMakeLists.txt_cuda4.0 index 98163be7d..9d674374d 100644 --- a/modules/gpu/CMakeLists.txt_cuda4.0 +++ b/modules/gpu/CMakeLists.txt_cuda4.0 @@ -104,7 +104,7 @@ set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "modules") endif() @@ -221,7 +221,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test) RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" ) - if(SOLUTION_FOLDERS_ENABLED) + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_test_target} PROPERTIES FOLDER "tests") endif() diff --git a/modules/haartraining/CMakeLists.txt b/modules/haartraining/CMakeLists.txt index ba36b7ec9..79e9cb3c0 100644 --- a/modules/haartraining/CMakeLists.txt +++ b/modules/haartraining/CMakeLists.txt @@ -84,7 +84,7 @@ install(TARGETS opencv_createsamples RUNTIME DESTINATION bin COMPONENT main) install(TARGETS opencv_performance RUNTIME DESTINATION bin COMPONENT main) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(opencv_performance PROPERTIES FOLDER "applications") set_target_properties(opencv_createsamples PROPERTIES FOLDER "applications") set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications") diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 501814e26..05eab652c 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -288,7 +288,7 @@ set_target_properties(${the_target} PROPERTIES LINK_INTERFACE_LIBRARIES "" ) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "modules") endif() diff --git a/modules/stitching/CMakeLists.txt b/modules/stitching/CMakeLists.txt index 6ff7e600e..e26d2ec3f 100644 --- a/modules/stitching/CMakeLists.txt +++ b/modules/stitching/CMakeLists.txt @@ -31,7 +31,7 @@ set_target_properties(${the_target} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" OUTPUT_NAME "opencv_stitching") -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "applications") endif() diff --git a/modules/traincascade/CMakeLists.txt b/modules/traincascade/CMakeLists.txt index 5a530a765..280270386 100644 --- a/modules/traincascade/CMakeLists.txt +++ b/modules/traincascade/CMakeLists.txt @@ -35,7 +35,7 @@ set_target_properties(${the_target} PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" OUTPUT_NAME "opencv_traincascade") -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "applications") endif() diff --git a/samples/c/CMakeLists.txt b/samples/c/CMakeLists.txt index 3b3fa1078..ce07827a8 100644 --- a/samples/c/CMakeLists.txt +++ b/samples/c/CMakeLists.txt @@ -40,7 +40,7 @@ if (BUILD_EXAMPLES) opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_calib3d opencv_legacy opencv_contrib) - if(SOLUTION_FOLDERS_ENABLED) + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "samples//c") endif() diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index e54fb9602..85e825848 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -40,7 +40,7 @@ if (BUILD_EXAMPLES) opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_calib3d opencv_legacy opencv_contrib) - if(SOLUTION_FOLDERS_ENABLED) + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "samples//cpp") endif() diff --git a/samples/gpu/CMakeLists.txt b/samples/gpu/CMakeLists.txt index a1a16bf74..d3ac2c479 100644 --- a/samples/gpu/CMakeLists.txt +++ b/samples/gpu/CMakeLists.txt @@ -42,7 +42,7 @@ if (BUILD_EXAMPLES) opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_gpu) - if(SOLUTION_FOLDERS_ENABLED) + if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "samples//gpu") endif() diff --git a/samples/gpu/performance/CMakeLists.txt b/samples/gpu/performance/CMakeLists.txt index 731ab2913..5d0741173 100644 --- a/samples/gpu/performance/CMakeLists.txt +++ b/samples/gpu/performance/CMakeLists.txt @@ -17,7 +17,7 @@ target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} opencv_core opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_gpu) -if(SOLUTION_FOLDERS_ENABLED) +if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "samples//gpu") endif()