Skip to content

Commit

Permalink
preparing paths for AUR
Browse files Browse the repository at this point in the history
  • Loading branch information
slizzered committed Oct 14, 2015
1 parent 19f7032 commit e62a933
Show file tree
Hide file tree
Showing 20 changed files with 40 additions and 22 deletions.
23 changes: 21 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,48 @@ project(elegant-progressbars-dev)
cmake_minimum_required(VERSION 3.0.2)



###############################################################################
# Compiler flags
###############################################################################
option(CMAKE_BUILD_TYPE "build type" Slow) # to show the progress
option(CMAKE_BUILD_TYPE "build type" Slow) # to show the progress. Don't use in real code!
SET (CMAKE_CXX_FLAGS "-Wall -Wextra -std=c++11")
SET (CMAKE_CXX_FLAGS_SLOW "-O0")



###############################################################################
# Progressbar for a More Civilized Age Config
###############################################################################
find_package(elegant-progressbars 1.0.0 REQUIRED PATHS "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")



###############################################################################
# Installation for Unix systems
###############################################################################
install(
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include"
DESTINATION "lib/elegant-progressbars"
)

install(
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
DESTINATION "lib/elegant-progressbars"
)



###############################################################################
# Build executables
###############################################################################
add_executable(ProgressBarExample examples/progressbar_example.cpp)



###############################################################################
# Custom targets
###############################################################################

# DOXYGEN
find_package(Doxygen)
if(DOXYGEN_FOUND)
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Installation
------------

###Manual###
Just put the folder ./lib/elegantProgressbars in a place where your compiler
Just put the folder `lib/elegant-progressbars` in a place where your compiler
will find it when searching for libraries to include.

You can use ```doxygen``` to get a nice documentation:
Expand All @@ -33,9 +33,8 @@ Example
There is an example which can be compiled and tested:

###Dependencies
- ```cmake``` >= 2.8.5
- ```clang``` >= 3.4
- (```g++``` >= 4.8.2 might also work, use ```cmake -DUSE_CLANG=OFF```)
- `cmake` >= 3.0.2
- `clang` >= 3.4 **or** `gcc >= 4.8.2`

###Build:
```bash
Expand Down
6 changes: 3 additions & 3 deletions cmake/elegant-progressbarsConfigVersion.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../include/elegantProgressbars/version.hpp" elegantProgressbars_VERSION_MAJOR_HPP REGEX "#define ELEGANTPROGRESSBARS_VERSION_MAJOR ")
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../include/elegantProgressbars/version.hpp" elegantProgressbars_VERSION_MINOR_HPP REGEX "#define ELEGANTPROGRESSBARS_VERSION_MINOR ")
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../include/elegantProgressbars/version.hpp" elegantProgressbars_VERSION_PATCH_HPP REGEX "#define ELEGANTPROGRESSBARS_VERSION_PATCH ")
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../include/elegant-progressbars/version.hpp" elegantProgressbars_VERSION_MAJOR_HPP REGEX "#define ELEGANTPROGRESSBARS_VERSION_MAJOR ")
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../include/elegant-progressbars/version.hpp" elegantProgressbars_VERSION_MINOR_HPP REGEX "#define ELEGANTPROGRESSBARS_VERSION_MINOR ")
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../include/elegant-progressbars/version.hpp" elegantProgressbars_VERSION_PATCH_HPP REGEX "#define ELEGANTPROGRESSBARS_VERSION_PATCH ")

string(REGEX MATCH "([0-9]+)" elegantProgressbars_VERSION_MAJOR ${elegantProgressbars_VERSION_MAJOR_HPP})
string(REGEX MATCH "([0-9]+)" elegantProgressbars_VERSION_MINOR ${elegantProgressbars_VERSION_MINOR_HPP})
Expand Down
8 changes: 4 additions & 4 deletions examples/progressbar_example.cpp
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#include <iostream>

#include "elegantProgressbars/policyProgressbar.hpp"
#include "elegantProgressbars/all_policies.hpp"
#include "elegant-progressbars/policyProgressbar.hpp"
#include "elegant-progressbars/all_policies.hpp"

#include "elegantProgressbars/fancyProgressbar.hpp"
#include "elegantProgressbars/fancyProgressbar_legacy.hpp"
#include "elegant-progressbars/fancyProgressbar.hpp"
#include "elegant-progressbars/fancyProgressbar_legacy.hpp"


//just some workload -> don't use optimizations, if you want that to work
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
9 changes: 9 additions & 0 deletions include/elegant-progressbars/all_policies.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#pragma once

#include "elegant-progressbars/Label.hpp"
#include "elegant-progressbars/Percentage.hpp"
#include "elegant-progressbars/Time.hpp"
#include "elegant-progressbars/Hourglass.hpp"
#include "elegant-progressbars/Newline.hpp"
#include "elegant-progressbars/Pattern.hpp"
#include "elegant-progressbars/Spinner.hpp"
File renamed without changes.
9 changes: 0 additions & 9 deletions include/elegantProgressbars/all_policies.hpp

This file was deleted.

0 comments on commit e62a933

Please sign in to comment.