Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

solution folder flag disabled by default

Browse Source
pull/13383/head
Anatoly Baksheev 14 years ago
parent 7b2e39a3f9
commit 69f28ef65c
18 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      3rdparty/libjasper/CMakeLists.txt
  2. 2
      3rdparty/libjpeg/CMakeLists.txt
  3. 2
      3rdparty/libpng/CMakeLists.txt
  4. 2
      3rdparty/libtiff/CMakeLists.txt
  5. 2
      3rdparty/zlib/CMakeLists.txt
  6. 4
      CMakeLists.txt
  7. 2
      modules/ffmpeg/CMakeLists.txt
  8. 4
      modules/gpu/CMakeLists.txt
  9. 4
      modules/gpu/CMakeLists.txt_cuda32
  10. 4
      modules/gpu/CMakeLists.txt_cuda4.0
  11. 2
      modules/haartraining/CMakeLists.txt
  12. 2
      modules/highgui/CMakeLists.txt
  13. 2
      modules/stitching/CMakeLists.txt
  14. 2
      modules/traincascade/CMakeLists.txt
  15. 2
      samples/c/CMakeLists.txt
  16. 2
      samples/cpp/CMakeLists.txt
  17. 2
      samples/gpu/CMakeLists.txt
  18. 2
      samples/gpu/performance/CMakeLists.txt

2
3rdparty/libjasper/CMakeLists.txt vendored
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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
Unescape 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()

Write Preview
Loading…
Cancel
Save