From f797f55b8d37922dcfb1ee54b68b3eb999ec614c Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 27 Jul 2016 12:49:01 +0200 Subject: [PATCH] Merge with develop --- code/CMakeLists.txt | 2 +- .../tools/leveldesign/georges_editor_qt/src/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 393d51dfb..c85030049 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -61,7 +61,7 @@ SET(NL_VERSION_MAJOR 0) SET(NL_VERSION_MINOR 12) SET(NL_VERSION_PATCH 0) SET(YEAR "2004-${CURRENT_YEAR}") -SET(AUTHOR "Winchgate and The Ryzom Core Community") +SET(AUTHOR "Winch Gate and The Ryzom Core Community") SET(RYZOM_VERSION_MAJOR 3) SET(RYZOM_VERSION_MINOR 0) diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt b/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt index b56322b2a..f7385ddfb 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/CMakeLists.txt @@ -49,8 +49,8 @@ if(APPLE) SET(MACOSX_BUNDLE_BUNDLE_NAME "Georges Editor Qt") SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.9") SET(MACOSX_BUNDLE_BUNDLE_VERSION "0.9") - SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community") -ENDIF(APPLE) + SET(MACOSX_BUNDLE_COPYRIGHT ${AUTHOR}) +ENDIF() ADD_EXECUTABLE(georges_editor_qt WIN32 MACOSX_BUNDLE ${GEORGES_EDITOR_SRC} ${GEORGES_EDITOR_MOC_SRCS} ${GEORGES_EDITOR_RC_SRCS} ${GEORGES_EDITOR_UI_HDRS}) @@ -68,6 +68,6 @@ NL_ADD_RUNTIME_FLAGS(georges_editor_qt) IF(WITH_PCH) ADD_NATIVE_PRECOMPILED_HEADER(georges_editor_qt ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.h ${CMAKE_CURRENT_SOURCE_DIR}/stdpch.cpp) -ENDIF(WITH_PCH) +ENDIF() INSTALL(TARGETS georges_editor_qt RUNTIME DESTINATION ${RYZOM_BIN_PREFIX} COMPONENT runtime BUNDLE DESTINATION /Applications)