generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

solution folder flag disabled by default

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/libjasper/CMakeLists.txt vendored
View File

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

2
3rdparty/libjpeg/CMakeLists.txt vendored
View File

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

2
3rdparty/libpng/CMakeLists.txt vendored
View File

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

2
3rdparty/libtiff/CMakeLists.txt vendored
View File

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

2
3rdparty/zlib/CMakeLists.txt vendored
View File

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

4
CMakeLists.txt
View File

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

2
modules/ffmpeg/CMakeLists.txt
View File

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

4
modules/gpu/CMakeLists.txt
View File

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

4
modules/gpu/CMakeLists.txt_cuda32
View File

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

4
modules/gpu/CMakeLists.txt_cuda4.0
View File

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

2
modules/haartraining/CMakeLists.txt
View File

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

2
modules/highgui/CMakeLists.txt
View File

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

2
modules/stitching/CMakeLists.txt
View File

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

2
modules/traincascade/CMakeLists.txt
View File

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

2
samples/c/CMakeLists.txt
View File

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

2
samples/cpp/CMakeLists.txt
View File

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

2
samples/gpu/CMakeLists.txt
View File

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

2
samples/gpu/performance/CMakeLists.txt
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_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()