From 586ddb6efdebe4a882803b4e89b44a1abb6caceb Mon Sep 17 00:00:00 2001 From: Matteo Paonessa Date: Sat, 28 Sep 2019 20:02:33 +0200 Subject: [PATCH] Minor updates to docs and build files --- .gitignore | 4 +++- .idea/codeStyles/Project.xml | 29 ----------------------------- CMakeLists.txt | 8 ++++++-- README.md | 7 ++++--- 4 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml diff --git a/.gitignore b/.gitignore index 8ef00d0..20a92cb 100644 --- a/.gitignore +++ b/.gitignore @@ -169,4 +169,6 @@ $RECYCLE.BIN/ modules.order Module.symvers Mkfile.old -dkms.conf \ No newline at end of file +dkms.conf + +build \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 72a962d..a41c947 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,8 +14,12 @@ configure_file( include_directories("${PROJECT_BINARY_DIR}") if (WIN32) include_directories("C:\\libcaesium\\caesium") -else() +else () include_directories("/usr/local/include") -endif() +endif () + +if (APPLE) + link_directories(/usr/local/lib) +endif () add_subdirectory(src) \ No newline at end of file diff --git a/README.md b/README.md index 1c83923..6260065 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## Caesium CommandLineTools -##### caesium-clt - v0.12.1-beta (build 20180812) - Copyright © Matteo Paonessa, 2018. All Rights Reserved. +##### caesium-clt - v0.13.0-beta (build 20190928) - Copyright © Matteo Paonessa, 2018. All Rights Reserved. [![Build Status](https://travis-ci.org/Lymphatus/caesium-clt.svg?branch=master)](https://travis-ci.org/Lymphatus/caesium-clt) ---------- @@ -13,8 +13,8 @@ ---------- ###### TESTED PLATFORMS -* Mac OS X High Sierra (v10.13.6) -* Ubuntu 18.04 +* Mac OS X Mojave (v10.14.4) +* Ubuntu 19.04 * Windows 10 ---------- @@ -94,6 +94,7 @@ $ caesiumclt -q 0 -RS -o ~/output/ ~/Pictures ---------- ###### CHANGELOG +* 0.13.0-beta - Bugfix * 0.12.1-beta - Bugfix * 0.12.0-beta - Resizing (experimental) * 0.11.0-beta - Fixing paths issues and dry-run option