solution folder flag disabled by default

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()	
     

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()	
     

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()
     

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()	
 

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()
 	

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()
 
 #-----------------------------------

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()						  
 

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()			
     

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()			
     

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()			
     

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")

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()	
 

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()	
 

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()	
 

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()
 

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()
 

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()
 

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()