From 1550fc3b6092671b34b36fc1eb5b0448f1417592 Mon Sep 17 00:00:00 2001 From: Tim Warren Date: Tue, 3 Nov 2015 13:30:00 -0500 Subject: [PATCH] Progress commit --- CMakeLists.txt | 10 ++++++---- README.md | 14 ++++---------- cmake.sh | 2 +- cmake/hunter/config.cmake | 9 +++++++++ 4 files changed, 20 insertions(+), 15 deletions(-) create mode 100644 cmake/hunter/config.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 191bb13..db91ba6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,8 +8,9 @@ set(CMAKE_CXX_STANDARD 11) # Hunter for dependency management include("cmake/HunterGate.cmake") HunterGate( - URL "https://github.com/ruslo/hunter/archive/v0.12.24.tar.gz" - SHA1 "a25a7fa55c204a8126efd1f48593a662925b26da" + URL "https://github.com/timw4mail/hunter/archive/1.0.1-timw4mail.tar.gz" + SHA1 "9aa41108d073e514cd87cb87c919f1471a8c74b7" + LOCAL ) project(Tyro) @@ -37,8 +38,9 @@ endif() # wxwidgets stuff set(wxWidgets_CONFIG_OPTIONS --static) -unset(WXSETUP_wxUSE_WEBVIEW_WEBKIT) -hunter_add_package(wxWidgets) +if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") + hunter_add_package(wxWidgets) +endif() find_package(wxWidgets COMPONENTS core base aui stc adv REQUIRED) include("${wxWidgets_USE_FILE}") diff --git a/README.md b/README.md index 20b826d..194fc90 100644 --- a/README.md +++ b/README.md @@ -17,22 +17,16 @@ A Cross-platform Code Editor Required packages: * build-essential -* libwxgtk3.0-dev * libssh2-1-dev - -Optional: - -* libwxgtk3.0-0-dbg -* libssh2-1-dbg - +* libwxgtk3.0-dev After these packages are installed, the project should build with a simple `make` command. ### OS X Building wxWidgets: -If you want maximum compatibility with older versions of OS X, -view [the guide](./Mac-compatibility-build.md). Otherwise, these simpler +If you want maximum compatibility with older versions of OS X, +view [the guide](./Mac-compatibility-build.md). Otherwise, these simpler steps should work fine for a local build. 1. Download the latest wxWidgets source (>= 3.0.2) @@ -64,4 +58,4 @@ Please note that make commands are chainable. For a typical programming loop, `m - + diff --git a/cmake.sh b/cmake.sh index 443125e..df6a6a6 100755 --- a/cmake.sh +++ b/cmake.sh @@ -9,7 +9,7 @@ export CMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/M if [[ "$OSTYPE" == "linux-gnu" ]]; then cd build - cmake -DHUNTER_SKIP_LOCK=ON .. + cmake -DHUNTER_ENABLED=OFF .. make "$@" cd .. elif [[ "$OSTYPE" == "darwin"* ]]; then diff --git a/cmake/hunter/config.cmake b/cmake/hunter/config.cmake new file mode 100644 index 0000000..7dd4d7c --- /dev/null +++ b/cmake/hunter/config.cmake @@ -0,0 +1,9 @@ +hunter_config( + wxWidgets + VERSION 3.0.2 + CMAKE_ARGS + WXBUILD_SYSTEM_PNG=OFF + WXBUILD_SHARED_LIBS=OFF + wxUSE_WEBVIEW_WEBKIT=OFF + wxUSE_GLCANVAS=OFF +) \ No newline at end of file