mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-06 22:26:32 +02:00
Don't install tomahawk_portfwd anymore
This commit is contained in:
@@ -320,7 +320,7 @@ endif()
|
||||
# Add all targets to the build-tree export set
|
||||
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH "Installation directory for CMake files")
|
||||
set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}")
|
||||
export(TARGETS tomahawklib tomahawk_portfwd
|
||||
export(TARGETS tomahawklib
|
||||
FILE "${PROJECT_BINARY_DIR}/TomahawkLibraryDepends.cmake")
|
||||
|
||||
# Export the package for use from the build-tree
|
||||
|
@@ -475,9 +475,11 @@ IF( UNIX AND NOT APPLE )
|
||||
ENDIF( UNIX AND NOT APPLE )
|
||||
|
||||
TARGET_LINK_LIBRARIES( tomahawklib
|
||||
LINK_PRIVATE
|
||||
# Thirdparty shipped with tomahawk
|
||||
${LIBPORTFWD_LIBRARIES}
|
||||
|
||||
LINK_PUBLIC
|
||||
# External deps
|
||||
${QJSON_LIBRARIES}
|
||||
${PHONON_LIBS}
|
||||
|
8
thirdparty/libportfwd/CMakeLists.txt
vendored
8
thirdparty/libportfwd/CMakeLists.txt
vendored
@@ -46,14 +46,6 @@ IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES( tomahawk_portfwd "ws2_32.dll" "iphlpapi.a" )
|
||||
ENDIF()
|
||||
|
||||
INSTALL( TARGETS tomahawk_portfwd
|
||||
EXPORT TomahawkLibraryDepends
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
BUNDLE DESTINATION library
|
||||
)
|
||||
|
||||
#INSTALL(FILES include/portfwd/portfwddllmacro.h include/portfwd/portfwd.h DESTINATION include/portfwd)
|
||||
|
||||
#ADD_EXECUTABLE(portfwd-demo
|
||||
|
Reference in New Issue
Block a user