Merge pull request #86 from xobs/remove-cmake-dep

Remove cmake dependency

Author: NoraCodes

.travis.yml

@@ -1,22 +1,28 @@
 language: rust
-rust:
-    - stable
-    - beta
-    - nightly
-matrix:
+jobs:
   allow_failures:
     - rust: nightly
-before_install:
-    - sudo apt-get -qq update
-    - sudo apt-get install -y cmake
-    - sudo apt-get install -y libgtk-3-dev
+  include:
+    - env: TEST_CMD=xvfb-run
+      rust: nightly
+    - env: TEST_CMD=xvfb-run
+      rust: beta
+    - env: TEST_CMD=xvfb-run
+      rust: stable
+    - env: MACOSX_DEPLOYMENT_TARGET=10.7 SKIP_INSTALL=1
+      rust: stable
+      os: osx
+before_install: |
+  [ "x$SKIP_INSTALL" != "x" ] || sudo apt-get -qq update
+  [ "x$SKIP_INSTALL" != "x" ] || sudo apt-get install -y libgtk-3-dev
+
 script:
     - cd ui-sys
     - cargo build --verbose --tests --examples
-    - xvfb-run cargo test
+    - $TEST_CMD cargo test
     - cd ../iui
     - cargo build --verbose --tests --examples
-    - xvfb-run cargo test
+    - $TEST_CMD cargo test
 after_success: |
   [ $TRAVIS_BRANCH = master ] &&
   [ $TRAVIS_PULL_REQUEST = false ] &&

README.md

@@ -48,7 +48,7 @@ Check out the [`examples/`](https://github.com/rust-native-ui/libui-rs/tree/0.3.
 This repository contains multiple Rust crates: 
 
 * `iui` is the safe Rust wrapper, to be used by most users.
-* `ui-sys` is the raw unsafe bindings to the `libui` C code. Requires `cmake` so it can build `libui`. `libui` is included as a submodule. 
+* `ui-sys` is the raw unsafe bindings to the `libui` C code. `libui` is included as a submodule.
 
 Also be sure to look at our [changelog](CHANGELOG.md) and learn [how to contribute](CONTRIBUTING.md).
 
@@ -60,8 +60,7 @@ default features `fetch` and `build`. With `fetch` disabled, it will simply buil
 existing sources without updating them, and with `build` disabled it will build nothing,
 assuming either a system or local (in `./lib/`) version of `libui` is available.
 
-Note that _most of the time_, building `libui` on the fly is what you want. It does however
-require a copy of cmake, essential build tools, et cetera.
+Note that _most of the time_, building `libui` on the fly is what you want.
 
 ## Acknowledgments
 

iui/Cargo.toml

@@ -41,5 +41,4 @@ maintenance = { status = "actively-developed" }
 bitflags = "1.0"
 libc = "0.2"
 failure = "0.1.1"
-ui-sys = { path = "../ui-sys", version = "0.2.1" } 
-
+ui-sys = { path = "../ui-sys", version = "0.2.1" }

iui/src/controls/progressbar.rs

@@ -20,6 +20,7 @@ use ui_sys::{self, uiControl, uiProgressBar};
 /// # use iui::prelude::*;
 /// # use iui::controls::{ProgressBar, ProgressBarValue};
 /// # let ui = UI::init().unwrap();
+/// # if cfg!(target_os = "macos") { return; }
 /// # let mut window = Window::new(&ui, "Test Window", 0, 0, WindowType::NoMenubar);
 /// let mut progressbar = ProgressBar::indeterminate(&ui);
 /// progressbar.set_value(&ui, 54);

ui-sys/Cargo.toml

@@ -48,6 +48,7 @@ build = []
 libc = "0.2"
 
 [build-dependencies]
-cmake = "0.1"
 bindgen = "0.31"
-
+cc = "1.0"
+embed-resource = "1.3"
+pkg-config = "0.3"