Skip to content

Commit

Permalink
Merge pull request #42 from trollLemon/cmake_tweaks
Browse files Browse the repository at this point in the history
Cmake tweaks
  • Loading branch information
trollLemon authored Nov 14, 2023
2 parents e9bd428 + ad2179b commit 86dea06
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 25 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,8 @@ set_source_files_properties(

PROPERTIES
COMPILE_FLAGS "-O2 -march=native -flto -Wall -Wextra -s")


find_package(X11 REQUIRED)
include_directories(${X11_INCLUDE_DIR})
include_directories("src/includes/")

target_link_libraries(cpluspalette ${X11_LIBRARIES})


install(TARGETS cpluspalette )
24 changes: 4 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,32 +129,26 @@ ________________________________________________________________________________

### What you need
#### Packages
You will need [CImg](https://www.cimg.eu/index.html), [ImageMagick](https://imagemagick.org/index.php), and the X11 headers installed on your system to build this project.
You will need [CImg](https://www.cimg.eu/index.html), and [ImageMagick](https://imagemagick.org/index.php) to build this project.

#### Compilers and Build tools
You will also need Cmake and the g++ compiler.
You will also need Cmake and a C++ compiler.


The following section includes installation instructions for these packages for different Linux distros.


### Arch and Arch-based Distros

On Arch, you can install CImg from the AUR with the following:
On Arch, you can install CImg from the official repos with the following:
```bash
yay CImg
sudo pacman -S cimg
```
and choose the option *community/cimg*.

Then install ImageMagick, which is available in the official arch repositories:
```bash

sudo pacman -S imagemagick
```
If you do not have the X11 headers, you can install them from the official repository:
```bash
sudo pacman -S libx11

```
### Debian and Debian-Based Distros

Expand All @@ -166,18 +160,8 @@ sudo apt install ImageMagick
```bash
sudo apt install cimg-dev
```
And the X11 headers, if you don't have them:
```bash
sudo apt install libx11-dev
```

### Fedora and Fedora-Based Distros

X11 headers:
```bash
sudo yum install libX11-dev
```

Cimg:

```bash
Expand Down
1 change: 1 addition & 0 deletions src/main.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define cimg_display 0
#include "CImg.h"
#include <iostream>
#include <string>
Expand Down

0 comments on commit 86dea06

Please sign in to comment.