Attachment #232131 for bug #313649

Lines 86-93 Link Here

(-)3rdparty/flann/CMakeLists.txt (-2 / +2 lines)
86	INSTALL (	86	INSTALL (
87	TARGETS flann flann_s	87	TARGETS flann flann_s
88	RUNTIME DESTINATION bin	88	RUNTIME DESTINATION bin
89	LIBRARY DESTINATION lib	89	LIBRARY DESTINATION "lib${LIB_SUFFIX}"
90	ARCHIVE DESTINATION lib	90	ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
91	)	91	)
92		92
93	# INSTALL (	93	# INSTALL (

Lines 63-68 Link Here

(-)tests/cxts/CMakeLists.txt (-2 / +2 lines)
63	if(WIN32)	63	if(WIN32)
64	install(TARGETS ${the_target}	64	install(TARGETS ${the_target}
65	RUNTIME DESTINATION bin COMPONENT main	65	RUNTIME DESTINATION bin COMPONENT main
66	LIBRARY DESTINATION lib COMPONENT main	66	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
67	ARCHIVE DESTINATION lib COMPONENT main)	67	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main)
68	endif()	68	endif()

Lines 40-45 Link Here

(-)interfaces/ffopencv/CMakeLists.txt (-2 / +2 lines)
40		40
41	install(TARGETS ${the_target}	41	install(TARGETS ${the_target}
42	RUNTIME DESTINATION bin COMPONENT main	42	RUNTIME DESTINATION bin COMPONENT main
43	ARCHIVE DESTINATION lib COMPONENT main	43	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
44	LIBRARY DESTINATION lib COMPONENT main	44	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
45	)	45	)

Lines 76-83 Link Here

(-)src/cvaux/CMakeLists.txt (-2 / +3 lines)
76		76
77	install(TARGETS ${the_target}	77	install(TARGETS ${the_target}
78	RUNTIME DESTINATION bin COMPONENT main	78	RUNTIME DESTINATION bin COMPONENT main
79	LIBRARY DESTINATION lib COMPONENT main	79	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
80	ARCHIVE DESTINATION lib COMPONENT main)	80	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
		81	)
81		82
82	install(FILES ${aux_hdrs_ext}	83	install(FILES ${aux_hdrs_ext}
83	DESTINATION include/opencv	84	DESTINATION include/opencv

Lines 282-289 Link Here

(-)src/highgui/CMakeLists.txt (-2 / +3 lines)
282		282
283	install(TARGETS ${the_target}	283	install(TARGETS ${the_target}
284	RUNTIME DESTINATION bin COMPONENT main	284	RUNTIME DESTINATION bin COMPONENT main
285	LIBRARY DESTINATION lib COMPONENT main	285	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
286	ARCHIVE DESTINATION lib COMPONENT main)	286	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
		287	)
287		288
288	install(FILES ${highgui_ext_hdrs}	289	install(FILES ${highgui_ext_hdrs}
289	DESTINATION include/opencv	290	DESTINATION include/opencv

Lines 475-482 Link Here

(-)CMakeLists.txt.orig (-2 / +2 lines)
475		475
476	string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")	476	string(REGEX MATCH "[0-9].[0-9]" PYTHON_VERSION_MAJOR_MINOR "${PYTHON_VERSION_FULL}")
477	if(UNIX)	477	if(UNIX)
478	set(PYTHON_PLUGIN_INSTALL_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)	478	set(PYTHON_PLUGIN_INSTALL_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages/opencv)
479	set(PYTHON_PACKAGES_PATH lib/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)	479	set(PYTHON_PACKAGES_PATH lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR_MINOR}/site-packages)
480	endif()	480	endif()
481	if(WIN32)	481	if(WIN32)
482	get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)	482	get_filename_component(PYTHON_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${PYTHON_VERSION_MAJOR_MINOR}\\InstallPath]" ABSOLUTE CACHE)

Lines 71-78 Link Here

(-)src/cv/CMakeLists.txt.orig (-2 / +3 lines)
71		71
72	install(TARGETS ${the_target}	72	install(TARGETS ${the_target}
73	RUNTIME DESTINATION bin COMPONENT main	73	RUNTIME DESTINATION bin COMPONENT main
74	LIBRARY DESTINATION lib COMPONENT main	74	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
75	ARCHIVE DESTINATION lib COMPONENT main)	75	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
		76	)
76		77
77	install(FILES ${lib_hdrs}	78	install(FILES ${lib_hdrs}
78	DESTINATION include/opencv	79	DESTINATION include/opencv

Lines 71-78 Link Here

(-)src/cxcore/CMakeLists.txt.orig (-2 / +3 lines)
71		71
72	install(TARGETS ${the_target}	72	install(TARGETS ${the_target}
73	RUNTIME DESTINATION bin COMPONENT main	73	RUNTIME DESTINATION bin COMPONENT main
74	LIBRARY DESTINATION lib COMPONENT main	74	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
75	ARCHIVE DESTINATION lib COMPONENT main)	75	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
		76	)
76		77
77	# install each module headers separately	78	# install each module headers separately
78	install(FILES ${lib_hdrs}	79	install(FILES ${lib_hdrs}

Lines 61-68 Link Here

(-)src/ml/CMakeLists.txt.orig (-2 / +3 lines)
61		61
62	install(TARGETS ${the_target}	62	install(TARGETS ${the_target}
63	RUNTIME DESTINATION bin COMPONENT main	63	RUNTIME DESTINATION bin COMPONENT main
64	LIBRARY DESTINATION lib COMPONENT main	64	LIBRARY DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
65	ARCHIVE DESTINATION lib COMPONENT main)	65	ARCHIVE DESTINATION "lib${LIB_SUFFIX}" COMPONENT main
		66	)
66		67
67	install(FILES ${lib_hdrs}	68	install(FILES ${lib_hdrs}
68	DESTINATION include/opencv	69	DESTINATION include/opencv

Return to bug 313649