diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-12-24 21:06:11 +0000 |
|---|---|---|
| committer | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2013-12-24 21:06:11 +0000 |
| commit | 123411e1ee17366ee88efd54b8482949b8e76eb5 (patch) | |
| tree | d33ef3d6f0a4ffcc1d2941e1386c7a50e1283cbc /x11-wm/pawm/files/patch-CMakeLists.txt | |
| parent | Use the right LICENSE name (diff) | |
- Properly look for X11 using CMake and include the appropriate directories
instead of relying on FREETYPE_INCLUDE_DIRS (which will change with the
upcoming Freetype 2.5.2 update) to pass -I${LOCALBASE}/include to the
compiler.
- Support staging.
- Set LICENSE (therefore stop installing the license file into DOCSDIR and
bump PORTREVISION).
- Remove the mysterious WITH_SN check, which was never a proper option and
relied on some apparently unstable API (at least it was unstable at the
time, almost 8 years ago).
Notes
Notes:
svn path=/head/; revision=337384
Diffstat (limited to 'x11-wm/pawm/files/patch-CMakeLists.txt')
| -rw-r--r-- | x11-wm/pawm/files/patch-CMakeLists.txt | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/x11-wm/pawm/files/patch-CMakeLists.txt b/x11-wm/pawm/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..c53e77236676 --- /dev/null +++ b/x11-wm/pawm/files/patch-CMakeLists.txt @@ -0,0 +1,19 @@ +--- CMakeLists.txt.orig 2013-12-24 22:52:47.000000000 +0200 ++++ CMakeLists.txt 2013-12-24 22:53:02.000000000 +0200 +@@ -39,6 +39,7 @@ + ENDIF (NOT XRANDR_FOUND) + + FIND_PACKAGE(Freetype REQUIRED) ++FIND_PACKAGE(X11 REQUIRED) + + # FIXME: Check if CMAKE_CONFIG_PREFIX is being set ok + SET(CMAKE_CONFIG_PREFIX "/etc") +@@ -56,7 +57,7 @@ + SET (CMAKE_C_FLAGS "-O2") + ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") + +-INCLUDE_DIRECTORIES(. ${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIRS}) ++INCLUDE_DIRECTORIES(. ${FREETYPE_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) + LINK_DIRECTORIES (. ${X11_LIBRARY_DIRS}) + LINK_LIBRARIES (-lm ${X11_LIBRARIES} ${XFT_LIBRARIES} ${XPM_LIBRARIES} ${XRANDR_LIBRARIES}) + ADD_CUSTOM_TARGET(signals.c DEPENDS src/signals.h src/signals.c) |