Commit 4da8266f authored by Jan Möbius's avatar Jan Möbius
Browse files

- Typo in fixbundle windows

- Raised Windows Qt test version to 5.3



git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@18709 383ad7c9-94d9-4d36-a494-682f7c89f535
parent bb2f6d13
...@@ -31,5 +31,5 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH) ...@@ -31,5 +31,5 @@ get_filename_component(_GlutDir "@GLUT_glut_LIBRARY@" PATH)
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/Plugins/*.dll") file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/Plugins/*.dll")
# fix all dependencies # fix all dependencies
fixup_bundle ("@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.exe" "${_plugins}" "${_GlutDir};@GLUT_LIBRARY_DIR@;@Qwt5_Qt4_LIBRARY_DIR@;@GLEW_LIBRARY_DIR@;@QT_BINARY_DIR@;@FTGL_LIBRARY_DIRS@;@FREETYPE_LIBRARY_DIR@;@NITE2_LIBRARY_DIR@;@OPENNI2_LIBRARY_DIR@;@QWT6_LIBRARY_DIR@;@ASSIMP_LIBRARY_DIR;@ASSIMP_LIBRARY_DIR@;@WINDOWS_COPY_LIBDIRS@") fixup_bundle ("@CMAKE_BINARY_DIR@/Build/@OPENFLIPPER_PRODUCT_STRING@.exe" "${_plugins}" "${_GlutDir};@GLUT_LIBRARY_DIR@;@Qwt5_Qt4_LIBRARY_DIR@;@GLEW_LIBRARY_DIR@;@QT_BINARY_DIR@;@FTGL_LIBRARY_DIRS@;@FREETYPE_LIBRARY_DIR@;@NITE2_LIBRARY_DIR@;@OPENNI2_LIBRARY_DIR@;@QWT6_LIBRARY_DIR@;@ASSIMP_LIBRARY_DIR@;@ASSIMP_LIBRARY_DIR@;@WINDOWS_COPY_LIBDIRS@")
...@@ -67,10 +67,10 @@ ...@@ -67,10 +67,10 @@
#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__ * 10) #define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__ * 10)
#if QT_VERSION > 0x050101 #if QT_VERSION > 0x050300
#ifdef WIN32 #ifdef WIN32
#pragma message("Detected QT Version higher than 5.1.1!") #pragma message("Detected QT Version higher than 5.3.0!")
#pragma message("OpenFlipper has not been tested with this QT Version.") #pragma message("OpenFlipper has not been tested with this QT Version on Windows.")
#else #else
#warning Detected QT Version higher than 4.8.4! #warning Detected QT Version higher than 4.8.4!
#warning OpenFlipper has not been tested with this QT Version. #warning OpenFlipper has not been tested with this QT Version.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment