mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-10 08:04:25 +02:00
Code Issues Releases Wiki Activity

Don't install tomahawk_portfwd anymore

Browse Source
This commit is contained in:
Dominik Schmidt
2013-05-08 17:31:49 +02:00
parent bd1caf276b
commit 836bf17719
3 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -320,7 +320,7 @@ endif()
# Add all targets to the build-tree export set # 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_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/Tomahawk" CACHE PATH "Installation directory for CMake files")
set(CMAKE_INSTALL_FULL_CMAKEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_CMAKEDIR}") 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") FILE "${PROJECT_BINARY_DIR}/TomahawkLibraryDepends.cmake")
# Export the package for use from the build-tree # Export the package for use from the build-tree

2
src/libtomahawk/CMakeLists.txt
View File

@@ -475,9 +475,11 @@ IF( UNIX AND NOT APPLE )
ENDIF( UNIX AND NOT APPLE ) ENDIF( UNIX AND NOT APPLE )
TARGET_LINK_LIBRARIES( tomahawklib TARGET_LINK_LIBRARIES( tomahawklib
LINK_PRIVATE
# Thirdparty shipped with tomahawk # Thirdparty shipped with tomahawk
${LIBPORTFWD_LIBRARIES} ${LIBPORTFWD_LIBRARIES}
LINK_PUBLIC
# External deps # External deps
${QJSON_LIBRARIES} ${QJSON_LIBRARIES}
${PHONON_LIBS} ${PHONON_LIBS}

8
thirdparty/libportfwd/CMakeLists.txt vendored
View File

@@ -46,14 +46,6 @@ IF(WIN32)
TARGET_LINK_LIBRARIES( tomahawk_portfwd "ws2_32.dll" "iphlpapi.a" ) TARGET_LINK_LIBRARIES( tomahawk_portfwd "ws2_32.dll" "iphlpapi.a" )
ENDIF() 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) #INSTALL(FILES include/portfwd/portfwddllmacro.h include/portfwd/portfwd.h DESTINATION include/portfwd)
#ADD_EXECUTABLE(portfwd-demo #ADD_EXECUTABLE(portfwd-demo