Attachment 12730 Details for Bug 28975 – opencpn-5.2.4-mga-cmakelists.txt_wxgtk_test.patch

[patch] opencpn-5.2.4-mga-cmakelists.txt_wxgtk_test.patch

opencpn-5.2.4-mga-cmakelists.txt_wxgtk_test.patch (text/plain), 1.99 KB, created by Philippe Didier on 2021-05-27 12:28:12 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Didier

Created: 2021-05-27 12:28:12 CEST

Size: 1.99 KB

patch

obsolete

>diff -ur OpenCPN-5.2.4/CMakeLists.txt OpenCPN-5.2.4_n/CMakeLists.txt
>--- OpenCPN-5.2.4/CMakeLists.txt	2020-10-23 00:20:06.000000000 +0100
>+++ OpenCPN-5.2.4_n/CMakeLists.txt	2020-10-28 19:40:12.912713757 +0000
>@@ -792,30 +792,30 @@
> endif (NOT QT_ANDROID)
> 
> # Handle #1500: Force NDEBUG on gtk3 for wxwidgets < 3.2 (all builds)
>-if (GTK3_FOUND)
>-  set( _VERSPROG [=[
>-    #include <stdio.h>
>-    #include <wx/version.h>
>-    int main(int argc, char**argv) {
>-      printf("%d\\n", wxMAJOR_VERSION * 10 + wxMINOR_VERSION);
>-    }
>-  ]=])
>-  set (TRY_COMPILE
>-    "echo '${_VERSPROG}' > wx-32.c; cc $(wx-config --cflags) wx-32.c; ./a.out")
>-  execute_process(
>-    COMMAND "/bin/sh" "-c" "${TRY_COMPILE}"
>-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>-    OUTPUT_VARIABLE _WX_VERSION
>-    ERROR_VARIABLE _WX_ERRORS
>-    OUTPUT_STRIP_TRAILING_WHITESPACE
>-  )
>-  if (NOT "${_WX_ERRORS}" STREQUAL "" OR "${_WX_VERSION}" STREQUAL "")
>-    message(FATAL_ERROR "Cannot run wxWidgets  version test (!)")
>-  elseif ("${_WX_VERSION}" LESS 32)
>-    add_definitions("-DNDEBUG")
>-    message(STATUS "Forcing -NDEBUG on gtk3 build (#1500).")
>-  endif ()
>-endif ()
>+#if (GTK3_FOUND)
>+#  set( _VERSPROG [=[
>+#    #include <stdio.h>
>+#    #include <wx/version.h>
>+#    int main(int argc, char**argv) {
>+#      printf("%d\\n", wxMAJOR_VERSION * 10 + wxMINOR_VERSION);
>+#    }
>+#  ]=])
>+#  set (TRY_COMPILE
>+#    "echo '${_VERSPROG}' > wx-32.c; cc $(wx-config --cflags) wx-32.c; ./a.out")
>+#  execute_process(
>+#    COMMAND "/bin/sh" "-c" "${TRY_COMPILE}"
>+#    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>+#    OUTPUT_VARIABLE _WX_VERSION
>+#    ERROR_VARIABLE _WX_ERRORS
>+#    OUTPUT_STRIP_TRAILING_WHITESPACE
>+#  )
>+#  if (NOT "${_WX_ERRORS}" STREQUAL "" OR "${_WX_VERSION}" STREQUAL "")
>+#    message(FATAL_ERROR "Cannot run wxWidgets  version test (!)")
>+#  elseif ("${_WX_VERSION}" LESS 32)
>+#    add_definitions("-DNDEBUG")
>+#    message(STATUS "Forcing -NDEBUG on gtk3 build (#1500).")
>+#  endif ()
>+#endif ()
> 
> IF(QT_ANDROID)
>   SET( wxWidgets_LIBRARIES

diff -ur OpenCPN-5.2.4/CMakeLists.txt OpenCPN-5.2.4_n/CMakeLists.txt
--- OpenCPN-5.2.4/CMakeLists.txt	2020-10-23 00:20:06.000000000 +0100
+++ OpenCPN-5.2.4_n/CMakeLists.txt	2020-10-28 19:40:12.912713757 +0000
@@ -792,30 +792,30 @@
 endif (NOT QT_ANDROID)
 
 # Handle #1500: Force NDEBUG on gtk3 for wxwidgets < 3.2 (all builds)
-if (GTK3_FOUND)
-  set( _VERSPROG [=[
-    #include <stdio.h>
-    #include <wx/version.h>
-    int main(int argc, char**argv) {
-      printf("%d\\n", wxMAJOR_VERSION * 10 + wxMINOR_VERSION);
-    }
-  ]=])
-  set (TRY_COMPILE
-    "echo '${_VERSPROG}' > wx-32.c; cc $(wx-config --cflags) wx-32.c; ./a.out")
-  execute_process(
-    COMMAND "/bin/sh" "-c" "${TRY_COMPILE}"
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    OUTPUT_VARIABLE _WX_VERSION
-    ERROR_VARIABLE _WX_ERRORS
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-  if (NOT "${_WX_ERRORS}" STREQUAL "" OR "${_WX_VERSION}" STREQUAL "")
-    message(FATAL_ERROR "Cannot run wxWidgets  version test (!)")
-  elseif ("${_WX_VERSION}" LESS 32)
-    add_definitions("-DNDEBUG")
-    message(STATUS "Forcing -NDEBUG on gtk3 build (#1500).")
-  endif ()
-endif ()
+#if (GTK3_FOUND)
+#  set( _VERSPROG [=[
+#    #include <stdio.h>
+#    #include <wx/version.h>
+#    int main(int argc, char**argv) {
+#      printf("%d\\n", wxMAJOR_VERSION * 10 + wxMINOR_VERSION);
+#    }
+#  ]=])
+#  set (TRY_COMPILE
+#    "echo '${_VERSPROG}' > wx-32.c; cc $(wx-config --cflags) wx-32.c; ./a.out")
+#  execute_process(
+#    COMMAND "/bin/sh" "-c" "${TRY_COMPILE}"
+#    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+#    OUTPUT_VARIABLE _WX_VERSION
+#    ERROR_VARIABLE _WX_ERRORS
+#    OUTPUT_STRIP_TRAILING_WHITESPACE
+#  )
+#  if (NOT "${_WX_ERRORS}" STREQUAL "" OR "${_WX_VERSION}" STREQUAL "")
+#    message(FATAL_ERROR "Cannot run wxWidgets  version test (!)")
+#  elseif ("${_WX_VERSION}" LESS 32)
+#    add_definitions("-DNDEBUG")
+#    message(STATUS "Forcing -NDEBUG on gtk3 build (#1500).")
+#  endif ()
+#endif ()
 
 IF(QT_ANDROID)
   SET( wxWidgets_LIBRARIES

Actions: View | Diff

Attachments on bug 28975: 12725 | 12726 | 12727 | 12728 | 12729 | 12730 | 12731 | 12732 | 12733 | 12734 | 12735 | 12736 | 12737 | 12738 | 12739 | 12740 | 12741 | 12742 | 12743 | 12744 | 12745 | 12746 | 12747 | 12748 | 12775 | 12776 | 12778 | 12779 | 12780 | 12781 | 12782 | 12783 | 12784 | 12785 | 12786 | 12787 | 12788 | 12789 | 12790 | 12791 | 12792 | 12793 | 12794 | 12795 | 12796 | 12797 | 12798 | 12799 | 12800 | 12801 | 12804 | 12805 | 12806 | 12807 | 12808 | 12809 | 12810 | 12811 | 12812 | 12813 | 12814 | 12815 | 12816 | 12817 | 12818 | 12819