timw4mail/Tyro
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More tweaking of Cmake files

Browse Source
This commit is contained in:
Timothy Warren 2015-10-29 13:55:01 -04:00
parent b73be045d4
commit 49a446c364
4 changed files with 37 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -23,5 +23,6 @@ addons:
- gcc-4.8 - gcc-4.8
- g++-4.8 - g++-4.8
- clang - clang
- libgtk2.0-dev
script: make clean run-tests script: make clean run-tests

12
CMakeLists.txt
View File

@ -3,7 +3,7 @@
################################################################################ ################################################################################
cmake_minimum_required (VERSION 3.0) cmake_minimum_required (VERSION 3.0)
set(CMAKE_CXX_STANDARD 11)
# Hunter for dependency management # Hunter for dependency management
include("cmake/HunterGate.cmake") include("cmake/HunterGate.cmake")
@ -30,9 +30,15 @@ else()
message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER} has no C++11 support.") message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER} has no C++11 support.")
endif() endif()
# Silence some useless errors
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wno-potentially-evaluated-expression)
endif()
# wxwidgets stuff # wxwidgets stuff
set(wxWidgets_CONFIG_OPTIONS --static) set(wxWidgets_CONFIG_OPTIONS --static)
unset(WXSETUP_wxUSE_WEBVIEW_WEBKIT)
hunter_add_package(wxWidgets) hunter_add_package(wxWidgets)
find_package(wxWidgets COMPONENTS core base aui stc adv REQUIRED) find_package(wxWidgets COMPONENTS core base aui stc adv REQUIRED)
include("${wxWidgets_USE_FILE}") include("${wxWidgets_USE_FILE}")
@ -51,8 +57,10 @@ include_directories(${INCLUDE_DIRS})
# set some platform-specific flags # set some platform-specific flags
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -stdlib=libc++ -Wno-potentially-evaluated-expression") set(CMAKE_CXX_FLAGS "--sysroot ${CMAKE_OSX_SYSROOT} ${CMAKE_CXX_FLAGS} -stdlib=libc++")
add_definitions(-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_ -D__WXMAC__) add_definitions(-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_ -D__WXMAC__)
else()
add_definitions(-D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_)
endif() endif()
################################################################################ ################################################################################

4
src/widgets/PrefPane.cpp
View File

@ -1,4 +1,3 @@
#ifndef TRAVIS
#include "src/widgets/PrefPane.h" #include "src/widgets/PrefPane.h"
#include "src/widgets/MainFrame.h" #include "src/widgets/MainFrame.h"
@ -160,6 +159,3 @@ void PrefPane::Show(wxWindow *parent)
{ {
this->pref_window->Show(parent); this->pref_window->Show(parent);
} }
#endif // ifndef TRAVIS

4
src/widgets/widget.h
View File

@ -16,10 +16,8 @@
#include <wx/dirctrl.h> #include <wx/dirctrl.h>
#include <wx/fontpicker.h> #include <wx/fontpicker.h>
#include <wx/treelist.h> #include <wx/treelist.h>
#ifndef TRAVIS
#include <wx/preferences.h> #include <wx/preferences.h>
#endif
#endif /* TYRO_WIDGET_H */ #endif /* TYRO_WIDGET_H */