mirror of
https://git.freebsd.org/ports.git
synced 2025-06-23 21:50:32 -04:00
734d437047
After the kdelibs update to 4.11.30 the CMake policies used by kdelibs-based projects got stricter. - Fix `make configure'. The upstream git repository has a add_subdirectory(doc) call, but the code generating the release tarball also added a macro_optional_add_subdirectory(doc) call that was causing CMake to error out due to the same directory being added twice to the build system. - Fix `make build' with the MUSEPACK option. The FindMuse.cmake patch from r346999 was hardcoding MUSE_LIBRARIES the wrong way. The find_library() call should have been kept, otherwise the linker is passed "-lmpcdec" instead of "/full/path/to/libmpcdec.so".
13 lines
513 B
CMake
13 lines
513 B
CMake
--- cmake/modules/FindMuse.cmake.orig 2014-11-04 18:37:31 UTC
|
|
+++ cmake/modules/FindMuse.cmake
|
|
@@ -15,9 +15,7 @@ if( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES
|
|
endif( MUSE_INCLUDE_DIR AND MUSE_LIBRARIES )
|
|
|
|
include(CheckIncludeFiles)
|
|
-check_include_files(mpc/mpcdec.h HAVE_MPC_MPCDEC_H)
|
|
-check_include_files(mpcdec/mpcdec.h HAVE_MPCDEC_MPCDEC_H)
|
|
-check_include_files(musepack/musepack.h HAVE_MUSEPACK_MUSEPACK_H)
|
|
+set ( HAVE_MPC_MPCDEC_H 1 )
|
|
|
|
if( HAVE_MPC_MPCDEC_H )
|
|
find_path( MUSE_INCLUDE_DIR mpc/mpcdec.h )
|