fix (?) travis error for MacOSX bundle build

Signed-off-by: Martin <[email protected]>
OpenHantek · Nov 9, 2019 · bcbf14f · bcbf14f
1 parent 5664ff4
commit bcbf14f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/openhantek/CMakeLists.txt b/openhantek/CMakeLists.txt
@@ -38,6 +38,22 @@ if(WIN32 AND MINGW)
     set(EXECTYPE WIN32)
 endif()
 
+# make executable
+add_executable(${PROJECT_NAME} ${EXECTYPE} ${SRC} ${HEADERS} ${UI}
+${QRC} ${TRANSLATION_BIN_FILES} ${TRANSLATION_QRC} ${ICONS})
+target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL ${OPENGL_LIBRARIES} )
+target_compile_features(${PROJECT_NAME} PRIVATE cxx_range_for)
+if(MSVC)
+    target_compile_options(${PROJECT_NAME} PRIVATE "/W4" "/wd4251" "/wd4127" "/wd4275" "/wd4200" "/nologo" "/J" "/Zi")
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:/MDd>")
+else()
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic)
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-DDEBUG>")
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-O0>")
+    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:RELEASE>:-fno-rtti>")
+endif()
+
+
 # Enable MacOSX bundle magic in the next line
 option(BUILD_MACOSX_BUNDLE "Build MacOS app bundle" ON)
 #
@@ -58,20 +74,6 @@ if( APPLE AND BUILD_MACOSX_BUNDLE )
     set_source_files_properties( ${ICONS} PROPERTIES MACOSX_PACKAGE_LOCATION "Resources" )
 endif()
 
-# make executable
-add_executable(${PROJECT_NAME} ${EXECTYPE} ${SRC} ${HEADERS} ${UI}
-${QRC} ${TRANSLATION_BIN_FILES} ${TRANSLATION_QRC} ${ICONS})
-target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL ${OPENGL_LIBRARIES} )
-target_compile_features(${PROJECT_NAME} PRIVATE cxx_range_for)
-if(MSVC)
-    target_compile_options(${PROJECT_NAME} PRIVATE "/W4" "/wd4251" "/wd4127" "/wd4275" "/wd4200" "/nologo" "/J" "/Zi")
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:/MDd>")
-else()
-    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wno-long-long -pedantic)
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-DDEBUG>")
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:DEBUG>:-O0>")
-    target_compile_options(${PROJECT_NAME} PRIVATE "$<$<CONFIG:RELEASE>:-fno-rtti>")
-endif()
 
 include(../cmake/fftw_on_windows.cmake)
 include(../cmake/libusb_on_windows.cmake)

diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h
@@ -1,2 +1,2 @@
 // Do not edit, will be re-created at each commit!
-#define OH_BUILD "20191109 build 544"
+#define OH_BUILD "20191109 build 545"