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

Fix launching the crash reporter from build dir on OSX

Browse Source
This commit is contained in:
Dominik Schmidt
2014-04-15 19:43:23 +02:00
parent 8ffa6634b8
commit c823ab0cdf
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@@ -103,10 +103,16 @@ ENDIF()
# set paths # set paths
SET( THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/thirdparty ) SET( THIRDPARTY_DIR ${CMAKE_SOURCE_DIR}/thirdparty )
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
# put executables into bundle dir on on osx
IF(APPLE)
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tomahawk.app/Contents/MacOS/" )
ELSE()
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
ENDIF()
# make predefined install dirs available everywhere # make predefined install dirs available everywhere
INCLUDE( GNUInstallDirs ) INCLUDE( GNUInstallDirs )

2
src/tests/CMakeLists.txt
View File

@@ -3,6 +3,8 @@ setup_qt()
enable_testing() enable_testing()
SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests" )
include_directories(${CMAKE_CURRENT_LIST_DIR}/../src/tomahawk ${CMAKE_CURRENT_LIST_DIR}/../src/libtomahawk) include_directories(${CMAKE_CURRENT_LIST_DIR}/../src/tomahawk ${CMAKE_CURRENT_LIST_DIR}/../src/libtomahawk)
include(tomahawk_add_test.cmake) include(tomahawk_add_test.cmake)

3
src/tomahawk/CMakeLists.txt
View File

@@ -162,6 +162,9 @@ SET_TARGET_PROPERTIES(tomahawk_bin
AUTOMOC TRUE AUTOMOC TRUE
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist" MACOSX_BUNDLE_INFO_PLIST "${CMAKE_BINARY_DIR}/Info.plist"
RUNTIME_OUTPUT_NAME tomahawk RUNTIME_OUTPUT_NAME tomahawk
# OSX: MACOSX_BUNDLE messes with paths
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
) )