ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor improvements for Wx compile tests 

Include `wx/wxprec.h` (precompiled header first in test programs to
possibly make the tests slightly faster.

For the ABI compat check, set a variable for the test program instead of
listing it twice.
This commit is contained in:
Rafael Kitover 2017-09-08 08:59:19 -07:00
parent ceef480e70
commit 42f6c446ea
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/wx/CMakeLists.txt
View File

@ -93,6 +93,7 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_FLAGS} ${CMAKE_REQUIRED_DEFINITI
INCLUDE(CheckCXXSourceCompiles) INCLUDE(CheckCXXSourceCompiles)
CHECK_CXX_SOURCE_COMPILES(" CHECK_CXX_SOURCE_COMPILES("
#include <wx/wxprec.h>
#include <wx/config.h> #include <wx/config.h>
#include <wx/glcanvas.h> #include <wx/glcanvas.h>
@ -110,8 +111,9 @@ ENDIF()
IF(CMAKE_COMPILER_IS_GNUCXX) IF(CMAKE_COMPILER_IS_GNUCXX)
INCLUDE(CheckCXXSourceRuns) INCLUDE(CheckCXXSourceRuns)
CHECK_CXX_SOURCE_RUNS(" SET(WX_TEST_CONSOLE_APP "
#include <cstdlib> #include <cstdlib>
#include <wx/wxprec.h>
#include <wx/wx.h> #include <wx/wx.h>
class MyApp : public wxAppConsole { class MyApp : public wxAppConsole {
@ -124,7 +126,9 @@ bool MyApp::OnInit() {
} }
wxIMPLEMENT_APP(MyApp); wxIMPLEMENT_APP(MyApp);
" WX_DEFAULT_ABI_VERSION_COMPATIBLE) ")
CHECK_CXX_SOURCE_RUNS("${WX_TEST_CONSOLE_APP}" WX_DEFAULT_ABI_VERSION_COMPATIBLE)
IF(NOT WX_DEFAULT_ABI_VERSION_COMPATIBLE) IF(NOT WX_DEFAULT_ABI_VERSION_COMPATIBLE)
# currently goes up to 11 with gcc7, but we give it some room # currently goes up to 11 with gcc7, but we give it some room
@ -139,21 +143,7 @@ wxIMPLEMENT_APP(MyApp);
SET(WX_ABI_VAR "WX_ABI_VERSION_${WX_ABI_VERSION}") SET(WX_ABI_VAR "WX_ABI_VERSION_${WX_ABI_VERSION}")
CHECK_CXX_SOURCE_RUNS(" CHECK_CXX_SOURCE_RUNS("${WX_TEST_CONSOLE_APP}" ${WX_ABI_VAR})
#include <cstdlib>
#include <wx/wx.h>
class MyApp : public wxAppConsole {
public:
virtual bool OnInit();
};
bool MyApp::OnInit() {
exit(0);
}
wxIMPLEMENT_APP(MyApp);
" ${WX_ABI_VAR})
IF(${${WX_ABI_VAR}}) IF(${${WX_ABI_VAR}})
BREAK() BREAK()