Deployment fix and project configuration improvement
This commit is contained in:
parent
99ebfd2f7b
commit
c951ef647a
1 changed files with 9 additions and 0 deletions
|
|
@ -96,6 +96,10 @@ set_target_properties(${TARGET_NAME} PROPERTIES
|
||||||
MACOSX_BUNDLE TRUE
|
MACOSX_BUNDLE TRUE
|
||||||
WIN32_EXECUTABLE TRUE
|
WIN32_EXECUTABLE TRUE
|
||||||
OUTPUT_NAME "${EXECUTABLE_NAME}"
|
OUTPUT_NAME "${EXECUTABLE_NAME}"
|
||||||
|
# Added for Qt to set the correct path on run configurations.
|
||||||
|
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
|
||||||
|
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
|
||||||
|
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}"
|
||||||
)
|
)
|
||||||
if(MSVC)
|
if(MSVC)
|
||||||
set_target_properties(${TARGET_NAME} PROPERTIES PDB_NAME "${EXECUTABLE_NAME}_app")
|
set_target_properties(${TARGET_NAME} PROPERTIES PDB_NAME "${EXECUTABLE_NAME}_app")
|
||||||
|
|
@ -114,6 +118,11 @@ endforeach()
|
||||||
# INSTALL
|
# INSTALL
|
||||||
################################################################
|
################################################################
|
||||||
|
|
||||||
|
|
||||||
install(TARGETS ${TARGET_NAME}
|
install(TARGETS ${TARGET_NAME}
|
||||||
BUNDLE DESTINATION .
|
BUNDLE DESTINATION .
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
||||||
|
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/data/assistant"
|
||||||
|
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${EXECUTABLE_NAME}"
|
||||||
|
USE_SOURCE_PERMISSIONS)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue