From aba9fb2a8203fb510c07913930a136451c15d9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Fri, 24 Apr 2009 09:31:35 +0000 Subject: [PATCH] Dennis: MacOs Bundle git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@5789 383ad7c9-94d9-4d36-a494-682f7c89f535 --- CoreApp/CMakeLists.txt | 46 ++++++++++++++++++++++++---------------- PluginLib/CMakeLists.txt | 4 +++- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/CoreApp/CMakeLists.txt b/CoreApp/CMakeLists.txt index 8c7ca334..f8a45f86 100644 --- a/CoreApp/CMakeLists.txt +++ b/CoreApp/CMakeLists.txt @@ -49,6 +49,8 @@ qt4_automoc (moc_targets ${headers}) if (WIN32) add_executable (OpenFlipper ${CMAKE_CURRENT_SOURCE_DIR}/CoreApp.rc ${uic_targets} ${sources} ${headers} ${moc_targets}) +elseif (APPLE) + add_executable (OpenFlipper MACOSX_BUNDLE ${uic_targets} ${sources} ${headers} ${moc_targets}) else () add_executable (OpenFlipper ${uic_targets} ${sources} ${headers} ${moc_targets}) endif () @@ -67,7 +69,16 @@ target_link_libraries (OpenFlipper ${FTGL_LIBS} ) -install (TARGETS OpenFlipper DESTINATION ${OPENFLIPPER_BINDIR}) +if (APPLE) + set_target_properties ( + OpenFlipper PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Build" + MACOSX_BUNDLE_INFO_STRING "ACG OpenFlipper" + MACOSX_BUNDLE_ICON_FILE "Icons/OpenFlipper_Icon.icns" + ) +else () + install (TARGETS OpenFlipper DESTINATION ${OPENFLIPPER_BINDIR}) +endif () if (WIN32) add_custom_command (TARGET OpenFlipper POST_BUILD @@ -77,21 +88,20 @@ if (WIN32) ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_BINDIR}/OpenFlipper.exe) endif () -add_custom_command(TARGET OpenFlipper POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../Shaders ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Shaders - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../Textures ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Textures - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../Icons ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Icons - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../Fonts ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Fonts - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../Docs ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Docs - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/../Help ${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Help -) -install(DIRECTORY - ${CMAKE_CURRENT_SOURCE_DIR}/../Shaders - ${CMAKE_CURRENT_SOURCE_DIR}/../Textures - ${CMAKE_CURRENT_SOURCE_DIR}/../Icons - ${CMAKE_CURRENT_SOURCE_DIR}/../Fonts - ${CMAKE_CURRENT_SOURCE_DIR}/../Docs - ${CMAKE_CURRENT_SOURCE_DIR}/../Help - DESTINATION ${OPENFLIPPER_DATADIR} -) +copy_after_build (OpenFlipper "${CMAKE_CURRENT_SOURCE_DIR}/../Shaders" "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Shaders") +copy_after_build (OpenFlipper "${CMAKE_CURRENT_SOURCE_DIR}/../Textures" "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Textures") +copy_after_build (OpenFlipper "${CMAKE_CURRENT_SOURCE_DIR}/../Icons" "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Icons") +copy_after_build (OpenFlipper "${CMAKE_CURRENT_SOURCE_DIR}/../Fonts" "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Fonts") +copy_after_build (OpenFlipper "${CMAKE_CURRENT_SOURCE_DIR}/../Docs" "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Docs") +copy_after_build (OpenFlipper "${CMAKE_CURRENT_SOURCE_DIR}/../Help" "${CMAKE_BINARY_DIR}/Build/${OPENFLIPPER_DATADIR}/Help") + + +if (NOT APPLE) + install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Shaders" "${OPENFLIPPER_DATADIR}/Shaders") + install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Textures" "${OPENFLIPPER_DATADIR}/Textures") + install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Icons" "${OPENFLIPPER_DATADIR}/Icons") + install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Fonts" "${OPENFLIPPER_DATADIR}/Fonts") + install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Docs" "${OPENFLIPPER_DATADIR}/Docs") + install_dir ("${CMAKE_CURRENT_SOURCE_DIR}/../Help" "${OPENFLIPPER_DATADIR}/Help") +endif () \ No newline at end of file diff --git a/PluginLib/CMakeLists.txt b/PluginLib/CMakeLists.txt index ec5ab30a..edbafe4c 100644 --- a/PluginLib/CMakeLists.txt +++ b/PluginLib/CMakeLists.txt @@ -61,7 +61,9 @@ target_link_libraries (PluginLib ${FTGL_LIBS} ) -install (TARGETS PluginLib DESTINATION ${OPENFLIPPER_LIBDIR}) +if (NOT APPLE) + install (TARGETS PluginLib DESTINATION ${OPENFLIPPER_LIBDIR}) +endif () if (WIN32) add_custom_command (TARGET PluginLib POST_BUILD -- GitLab