solution folder flag disabled by default

This commit is contained in:
Anatoly Baksheev 2011-05-17 09:40:06 +00:00
parent 7b2e39a3f9
commit 69f28ef65c
18 changed files with 22 additions and 22 deletions

View File

@ -48,7 +48,7 @@ set_target_properties(${the_target}
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty")
endif() endif()

View File

@ -40,7 +40,7 @@ set_target_properties(${the_target}
ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/3rdparty/lib ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/3rdparty/lib
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty")
endif() endif()

View File

@ -41,7 +41,7 @@ set_target_properties(${the_target}
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty")
endif() endif()

View File

@ -95,7 +95,7 @@ set_target_properties(${the_target}
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib/" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib/"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty")
endif() endif()

View File

@ -32,7 +32,7 @@ set_target_properties(${the_target}
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib" ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/3rdparty/lib"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty") set_target_properties(${the_target} PROPERTIES FOLDER "3rdparty")
endif() endif()

View File

@ -1276,7 +1276,7 @@ endif()
if(${CMAKE_VERSION} VERSION_GREATER "2.8.0") if(${CMAKE_VERSION} VERSION_GREATER "2.8.0")
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets") set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "CMakeTargets")
set(SOLUTION_FOLDERS_ENABLED 1) set(ENABLE_SOLUTION_FOLDERS OFF CACHE BOOL "Solution folder in Visual Studio or in other IDEs")
endif() endif()
#----------------------------------- #-----------------------------------

View File

@ -47,7 +47,7 @@ set_target_properties(${the_target} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "modules") set_target_properties(${the_target} PROPERTIES FOLDER "modules")
endif() endif()

View File

@ -104,7 +104,7 @@ set_target_properties(${the_target} PROPERTIES
OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}" OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "modules") set_target_properties(${the_target} PROPERTIES FOLDER "modules")
endif() endif()
@ -217,7 +217,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_test_target} PROPERTIES FOLDER "tests") set_target_properties(${the_test_target} PROPERTIES FOLDER "tests")
endif() endif()

View File

@ -104,7 +104,7 @@ set_target_properties(${the_target} PROPERTIES
OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}" OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "modules") set_target_properties(${the_target} PROPERTIES FOLDER "modules")
endif() endif()
@ -217,7 +217,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_test_target} PROPERTIES FOLDER "tests") set_target_properties(${the_test_target} PROPERTIES FOLDER "tests")
endif() endif()

View File

@ -104,7 +104,7 @@ set_target_properties(${the_target} PROPERTIES
OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}" OUTPUT_NAME "${the_target}${OPENCV_DLLVERSION}"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "modules") set_target_properties(${the_target} PROPERTIES FOLDER "modules")
endif() endif()
@ -221,7 +221,7 @@ if(BUILD_TESTS AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/test)
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/" RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/"
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_test_target} PROPERTIES FOLDER "tests") set_target_properties(${the_test_target} PROPERTIES FOLDER "tests")
endif() endif()

View File

@ -84,7 +84,7 @@ install(TARGETS opencv_createsamples RUNTIME DESTINATION bin COMPONENT main)
install(TARGETS opencv_performance 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_performance PROPERTIES FOLDER "applications")
set_target_properties(opencv_createsamples PROPERTIES FOLDER "applications") set_target_properties(opencv_createsamples PROPERTIES FOLDER "applications")
set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications") set_target_properties(opencv_haartraining PROPERTIES FOLDER "applications")

View File

@ -288,7 +288,7 @@ set_target_properties(${the_target} PROPERTIES
LINK_INTERFACE_LIBRARIES "" LINK_INTERFACE_LIBRARIES ""
) )
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "modules") set_target_properties(${the_target} PROPERTIES FOLDER "modules")
endif() endif()

View File

@ -31,7 +31,7 @@ set_target_properties(${the_target} PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
OUTPUT_NAME "opencv_stitching") OUTPUT_NAME "opencv_stitching")
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "applications") set_target_properties(${the_target} PROPERTIES FOLDER "applications")
endif() endif()

View File

@ -35,7 +35,7 @@ set_target_properties(${the_target} PROPERTIES
INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
OUTPUT_NAME "opencv_traincascade") OUTPUT_NAME "opencv_traincascade")
if(SOLUTION_FOLDERS_ENABLED) if(ENABLE_SOLUTION_FOLDERS)
set_target_properties(${the_target} PROPERTIES FOLDER "applications") set_target_properties(${the_target} PROPERTIES FOLDER "applications")
endif() endif()

View File

@ -40,7 +40,7 @@ if (BUILD_EXAMPLES)
opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
opencv_features2d opencv_calib3d opencv_legacy opencv_contrib) 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") set_target_properties(${the_target} PROPERTIES FOLDER "samples//c")
endif() endif()

View File

@ -40,7 +40,7 @@ if (BUILD_EXAMPLES)
opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
opencv_features2d opencv_calib3d opencv_legacy opencv_contrib) 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") set_target_properties(${the_target} PROPERTIES FOLDER "samples//cpp")
endif() endif()

View File

@ -42,7 +42,7 @@ if (BUILD_EXAMPLES)
opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect opencv_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_gpu) 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") set_target_properties(${the_target} PROPERTIES FOLDER "samples//gpu")
endif() endif()

View File

@ -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_flann opencv_imgproc opencv_highgui opencv_ml opencv_video opencv_objdetect
opencv_features2d opencv_calib3d opencv_legacy opencv_contrib opencv_gpu) 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") set_target_properties(${the_target} PROPERTIES FOLDER "samples//gpu")
endif() endif()