Skip to content

Commit 6e4fb52

Browse files
authored
Merge pull request #301 from antecrescent/deps
Build system: remove unnecessary dependency on GLX, PkgConfig, fix SLOP_FOUND logic, update README
2 parents 1011cfe + cae465b commit 6e4fb52

File tree

4 files changed

+8
-54
lines changed

4 files changed

+8
-54
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ target_link_libraries( ${BIN_TARGET}
6464
${XRANDR_LIBRARY}
6565
${JPEG_LIBRARIES}
6666
${XRENDER_LIBRARY}
67-
${SLOP_LIBRARIES}
67+
${SLOP_LIBRARY}
6868
${WEBP_LIBRARY} )
6969

7070
if( ${CMAKE_VERSION} VERSION_LESS 3.7 )

README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,12 @@ maim (Make Image) is an utility that takes screenshots of your desktop. It's mea
3939
* [Alpine Linux: maim](https://pkgs.alpinelinux.org/packages?name=maim&branch=edge&repo=&arch=&maintainer=)
4040
* Please make a package for maim on your favorite system, and make a pull request to add it to this list.
4141

42-
### Install using CMake (Requires CMake, git, libXrender, libXfixes, libGLM, libxcomposite, libxrandr, libxext, GLEW)
42+
### Install using CMake
43+
#### Requires these at build-time:
44+
CMake, glm, x11proto
45+
46+
#### Requires these at build- and runtime:
47+
libjpeg-turbo, libpng, libwebp, libX11, libXcomposite, libXext, libXfixes, libXrandr, libXrender
4348
```bash
4449
git clone https://github.com/naelstrof/slop.git
4550
cd slop

modules/FindGLX.cmake

Lines changed: 0 additions & 44 deletions
This file was deleted.

modules/FindSLOP.cmake

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,11 @@ find_path( SLOP_INCLUDE_DIR
1313
PATH_SUFFIXES /usr/include /include
1414
DOC "The SLOP include directory" )
1515

16-
find_library( SLOP_LIBRARIES
16+
find_library( SLOP_LIBRARY
1717
NAMES slopy slopy.so slop slop.so
1818
PATHS /usr/lib /lib
1919
DOC "The SLOP library" )
2020

21-
FIND_PACKAGE(X11 REQUIRED)
22-
FIND_PACKAGE(GLX REQUIRED)
23-
list(APPEND SLOP_LIBRARIES
24-
${X11_LIBRARIES}
25-
${GLX_LIBRARY}
26-
)
27-
2821
if( SLOP_INCLUDE_DIR AND SLOP_LIBRARY )
2922
set( SLOP_FOUND 1 )
3023
else()

0 commit comments

Comments
 (0)