Progress commit
This commit is contained in:
parent
e9c46642f9
commit
1550fc3b60
@ -8,8 +8,9 @@ set(CMAKE_CXX_STANDARD 11)
|
|||||||
# Hunter for dependency management
|
# Hunter for dependency management
|
||||||
include("cmake/HunterGate.cmake")
|
include("cmake/HunterGate.cmake")
|
||||||
HunterGate(
|
HunterGate(
|
||||||
URL "https://github.com/ruslo/hunter/archive/v0.12.24.tar.gz"
|
URL "https://github.com/timw4mail/hunter/archive/1.0.1-timw4mail.tar.gz"
|
||||||
SHA1 "a25a7fa55c204a8126efd1f48593a662925b26da"
|
SHA1 "9aa41108d073e514cd87cb87c919f1471a8c74b7"
|
||||||
|
LOCAL
|
||||||
)
|
)
|
||||||
|
|
||||||
project(Tyro)
|
project(Tyro)
|
||||||
@ -37,8 +38,9 @@ endif()
|
|||||||
|
|
||||||
# wxwidgets stuff
|
# wxwidgets stuff
|
||||||
set(wxWidgets_CONFIG_OPTIONS --static)
|
set(wxWidgets_CONFIG_OPTIONS --static)
|
||||||
unset(WXSETUP_wxUSE_WEBVIEW_WEBKIT)
|
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
|
||||||
hunter_add_package(wxWidgets)
|
hunter_add_package(wxWidgets)
|
||||||
|
endif()
|
||||||
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}")
|
||||||
|
|
||||||
|
@ -17,14 +17,8 @@ A Cross-platform Code Editor
|
|||||||
Required packages:
|
Required packages:
|
||||||
|
|
||||||
* build-essential
|
* build-essential
|
||||||
* libwxgtk3.0-dev
|
|
||||||
* libssh2-1-dev
|
* libssh2-1-dev
|
||||||
|
* libwxgtk3.0-dev
|
||||||
Optional:
|
|
||||||
|
|
||||||
* libwxgtk3.0-0-dbg
|
|
||||||
* libssh2-1-dbg
|
|
||||||
|
|
||||||
|
|
||||||
After these packages are installed, the project should build with a simple `make` command.
|
After these packages are installed, the project should build with a simple `make` command.
|
||||||
|
|
||||||
|
2
cmake.sh
2
cmake.sh
@ -9,7 +9,7 @@ export CMAKE_OSX_SYSROOT="/Applications/Xcode.app/Contents/Developer/Platforms/M
|
|||||||
|
|
||||||
if [[ "$OSTYPE" == "linux-gnu" ]]; then
|
if [[ "$OSTYPE" == "linux-gnu" ]]; then
|
||||||
cd build
|
cd build
|
||||||
cmake -DHUNTER_SKIP_LOCK=ON ..
|
cmake -DHUNTER_ENABLED=OFF ..
|
||||||
make "$@"
|
make "$@"
|
||||||
cd ..
|
cd ..
|
||||||
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
|
9
cmake/hunter/config.cmake
Normal file
9
cmake/hunter/config.cmake
Normal file
@ -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
|
||||||
|
)
|
Loading…
Reference in New Issue
Block a user