mirror of
https://git.freebsd.org/ports.git
synced 2025-06-17 10:40:46 -04:00
069eb5d63d
The kipi-plugin-* ports are all built from the same tarball, which is also used to build kipi-plugins-kde4 as well. Upstream does not expect this to happen, and refers to libkipiplugins.so as the "kipiplugins" target in CMake. Since we build everything separately, each plugin's build system code does not know this target, which results in -lkipiplugins (without -L/path/to) being passed to the linker instead of /path/to/libkipiplugins.so. Fix it by looking for libkipiplugins.so via CMake and using that result in each port. kipi-plugin-ipodexport needs an additional but similar fix, in that it should look for libgpod using CMake instead of using pkg-config's results directly, as the latter do not contain full paths. Reviewed by: tcberner
26 lines
931 B
CMake
26 lines
931 B
CMake
Always look for libgpod using CMake instead of just using the pkg-config call
|
|
directly, as the latter does not use full paths.
|
|
--- cmake/modules/FindIpod.cmake
|
|
+++ cmake/modules/FindIpod.cmake
|
|
@@ -14,12 +14,6 @@ if (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
|
|
SET(IPOD_FOUND TRUE)
|
|
|
|
else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
|
|
- if(NOT WIN32)
|
|
- # use pkg-config to get the directories and then use these values
|
|
- # in the FIND_PATH() and FIND_LIBRARY() calls
|
|
- find_package(PkgConfig)
|
|
- PKG_SEARCH_MODULE(IPOD libgpod-1.0)
|
|
- else(NOT WIN32)
|
|
find_path(IPOD_INCLUDE_DIRS
|
|
NAMES
|
|
gpod/itdb.h
|
|
@@ -32,7 +26,7 @@ else (IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
|
|
if(IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
|
|
set(IPOD_FOUND ON)
|
|
endif(IPOD_INCLUDE_DIRS AND IPOD_LIBRARIES)
|
|
- endif(NOT WIN32)
|
|
+
|
|
IF (IPOD_FOUND)
|
|
IF (NOT IPOD_FIND_QUIETLY)
|
|
MESSAGE(STATUS "Found libgpod-1 ${IPOD_VERSION}")
|