From 155257fe41e09f35b507164e20491a094ed7a4d4 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Wed, 11 May 2016 00:15:56 +0100 Subject: [PATCH] Fix cmake errors in windows installation --- CMakeLists.txt | 1 - cmake/Win32.cmake | 7 ++++--- modules/CMakeLists.txt | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1779dac..bc46035 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,5 +176,4 @@ MESSAGE( STATUS " Static libs: " "${USE_STATIC}" ) MESSAGE( STATUS " Build type: " "${CMAKE_BUILD_TYPE}" ) MESSAGE( STATUS " Build flags: " "${CMAKE_CXX_FLAGS}" ) - FEATURE_SUMMARY(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/cmake/Win32.cmake b/cmake/Win32.cmake index 833bbce..9030f69 100644 --- a/cmake/Win32.cmake +++ b/cmake/Win32.cmake @@ -14,6 +14,7 @@ INSTALL(FILES ${MSVC_DLL_DIR}/msvcr120.dll DESTINATION bin ) INSTALL(FILES ${MSVC_DLL_DIR}/msvcp120.dll DESTINATION bin ) SET(QT_DIR "QT-Dir" CACHE PATH "Where to find QT Lib on Windows") +SET(QT_ICU_VERSION "" CACHE STRING "Qt ICU version of dll's" ) SET(QT_DLL_POSTFIX "" CACHE STRING "Postfix to dll's name for debug" ) SET(CMAKE_PREFIX_PATH "${CMAKE_PREFIX_PATH} ${QT_DIR}" ) @@ -26,9 +27,9 @@ IF( NOT USE_QT4 ) INSTALL(FILES ${QT_DIR}/bin/Qt5Widgets${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/libGLESv2${QT_DLL_POSTFIX}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/bin/libEGL${QT_DLL_POSTFIX}.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/icudt52.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/icuin52.dll DESTINATION bin ) - INSTALL(FILES ${QT_DIR}/bin/icuuc52.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/icudt${QT_ICU_VERSION}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/icuin${QT_ICU_VERSION}.dll DESTINATION bin ) + INSTALL(FILES ${QT_DIR}/bin/icuuc${QT_ICU_VERSION}.dll DESTINATION bin ) INSTALL(FILES ${QT_DIR}/plugins/platforms/qminimal.dll DESTINATION bin/platforms ) INSTALL(FILES ${QT_DIR}/plugins/platforms/qoffscreen.dll DESTINATION bin/platforms ) INSTALL(FILES ${QT_DIR}/plugins/platforms/qwindows.dll DESTINATION bin/platforms ) diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt index 1971450..ed2b6ca 100644 --- a/modules/CMakeLists.txt +++ b/modules/CMakeLists.txt @@ -54,13 +54,13 @@ ENDIF() file( WRITE ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "// This files add the header files of each module\n" "#ifndef __MODULESLISTHEADER_H__\n#define __MODULESLISTHEADER_H__\n" ) -foreach(module ${MODULES_LIST_FILES} ) +foreach(module ${MODULES_LIST_FILES}) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "#include \"${module}.h\"\n") -endforeach(module_Name) +endforeach(module ${MODULES_LIST_FILES}) file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "#define REGISTER_ALL_MODULES \\\n" ) -foreach(module ${MODULES_LIST_NAME} ) +foreach(module ${MODULES_LIST_NAME}) file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "Register( \"${module}\", &(${module}::Create) ); \\\n") -endforeach(module_Name) +endforeach(module ${MODULES_LIST_NAME}) file( APPEND ${CMAKE_CURRENT_BINARY_DIR}/ModulesListHeader.h "\n#endif // __MODULESLISTHEADER_H__\n" ) INCLUDE_DIRECTORIES( ${OpenCV_INCLUDE_DIRS} )