From 2529616f20d2824fc6676a6d0b34bef2eef58fc4 Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 11 Jun 2010 11:57:10 +0200 Subject: [PATCH] Changed: #842 Prefix all Ryzom binaries by ryzom_ --- code/ryzom/client/src/CMakeLists.txt | 23 +++++++++---------- .../client/src/client_sheets/CMakeLists.txt | 21 ++++++++--------- .../ryzom/client/src/seven_zip/CMakeLists.txt | 21 +++++++++++------ .../common/src/game_share/CMakeLists.txt | 16 ++++++------- 4 files changed, 42 insertions(+), 39 deletions(-) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 763433c9a..0f0df597f 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -44,22 +44,22 @@ if(APPLE) SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0") SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community") - ADD_EXECUTABLE(client MACOSX_BUNDLE ${SRC}) + ADD_EXECUTABLE(ryzom_client MACOSX_BUNDLE ${SRC}) # TODO: in release mode, cmake could copy all the dylibs into the .app # bundle for redistribution... should some part of cpack handle that? - # ADD_CUSTOM_COMMAND(TARGET client POST_BUILD + # ADD_CUSTOM_COMMAND(TARGET ryzom_client POST_BUILD # # make frameworks directory in app bundle # COMMAND ${CMAKE_COMMAND} -E make_directory - # ${CMAKE_CURRENT_BINARY_DIR}/client.app/Contents/Frameworks + # ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks # # copy framework into app bundle # COMMAND ${CMAKE_COMMAND} -E copy ${SOME_LIBRARY} - # ${CMAKE_CURRENT_BINARY_DIR}/client.app/Contents/Frameworks + # ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks # # ... # # install_name_tool the lib pathes ELSE(APPLE) - ADD_EXECUTABLE(client ${SRC}) + ADD_EXECUTABLE(ryzom_client ${SRC}) ENDIF(APPLE) INCLUDE_DIRECTORIES( @@ -70,10 +70,10 @@ INCLUDE_DIRECTORIES( ${CURL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS} +TARGET_LINK_LIBRARIES(ryzom_client ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY} - game_share + ryzom_gameshare ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} @@ -82,18 +82,17 @@ TARGET_LINK_LIBRARIES(client ${PLATFORM_LINKFLAGS} ${CURL_LIBRARIES} ${NELSOUND_LIBRARY} ${NELSNDDRV_LIBRARY} - client_sheets + ryzom_clientsheets ${NELPACS_LIBRARY} ${LIBWWW_LIBRARY} - ${Boost_LIBRARIES} - seven_zip + ryzom_sevenzip luabind # TODO: find luabind and expat cleanly using a find script expat) IF(NOT WITH_COCOA) - TARGET_LINK_LIBRARIES(client ${X11_LIBRARIES}) + TARGET_LINK_LIBRARIES(ryzom_client ${X11_LIBRARIES}) ENDIF(NOT WITH_COCOA) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -INSTALL(TARGETS client RUNTIME DESTINATION bin COMPONENT client BUNDLE DESTINATION /Applications) +INSTALL(TARGETS ryzom_client RUNTIME DESTINATION bin COMPONENT client BUNDLE DESTINATION /Applications) diff --git a/code/ryzom/client/src/client_sheets/CMakeLists.txt b/code/ryzom/client/src/client_sheets/CMakeLists.txt index 775a3fd1c..541fd6852 100644 --- a/code/ryzom/client/src/client_sheets/CMakeLists.txt +++ b/code/ryzom/client/src/client_sheets/CMakeLists.txt @@ -5,26 +5,23 @@ SOURCE_GROUP(headers FILES ${PRIV_H} ${PUB_H}) IF(NOT WIN32) - ADD_LIBRARY(client_sheets SHARED ${SRC}) + ADD_LIBRARY(ryzom_clientsheets SHARED ${SRC}) ELSE(NOT WIN32) - ADD_LIBRARY(client_sheets STATIC ${SRC}) + ADD_LIBRARY(ryzom_clientsheets STATIC ${SRC}) ENDIF(NOT WIN32) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(client_sheets game_share ${NELMISC_LIBRARY}) -SET_TARGET_PROPERTIES(client_sheets PROPERTIES VERSION ${NL_VERSION}) +INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR}) +TARGET_LINK_LIBRARIES(ryzom_clientsheets ryzom_gameshare ${NELMISC_LIBRARY}) +SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) - SET_TARGET_PROPERTIES(client_sheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h") + SET_TARGET_PROPERTIES(ryzom_clientsheets PROPERTIES COMPILE_FLAGS "/Yustdpch.h") SET_SOURCE_FILES_PROPERTIES(stdpch.cpp PROPERTIES COMPILE_FLAGS "/Ycstdpch.h") - SET_TARGET_PROPERTIES(client_sheets + SET_TARGET_PROPERTIES(ryzom_clientsheets PROJECT_LABEL "Library: Client Sheets" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") + LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt" ENDIF(WIN32) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - -INSTALL(TARGETS client_sheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) +INSTALL(TARGETS ryzom_clientsheets LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) diff --git a/code/ryzom/client/src/seven_zip/CMakeLists.txt b/code/ryzom/client/src/seven_zip/CMakeLists.txt index 6182eed5d..f116006d6 100644 --- a/code/ryzom/client/src/seven_zip/CMakeLists.txt +++ b/code/ryzom/client/src/seven_zip/CMakeLists.txt @@ -6,21 +6,28 @@ LIST(REMOVE_ITEM LIB_SRC ${CMAKE_CURRENT_SOURCE_DIR}/7zMain.cpp) ADD_EXECUTABLE(7zDec ${SRC}) -INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR}) -TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${LIBXML2_LIBRARIES} ${NELMISC_LIBRARY}) +INCLUDE_DIRECTORIES(${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) +TARGET_LINK_LIBRARIES(7zDec ${PLATFORM_LINKFLAGS} ${NELMISC_LIBRARY}) -ADD_LIBRARY(seven_zip STATIC ${LIB_SRC}) -TARGET_LINK_LIBRARIES(seven_zip ${PLATFORM_LINKFLAGS}) +IF(NOT WIN32) + ADD_LIBRARY(ryzom_sevenzip SHARED ${LIB_SRC}) +ELSE(NOT WIN32) + ADD_LIBRARY(ryzom_sevenzip STATIC ${LIB_SRC}) +ENDIF(NOT WIN32) + +TARGET_LINK_LIBRARIES(ryzom_sevenzip ${PLATFORM_LINKFLAGS}) +SET_TARGET_PROPERTIES(ryzom_sevenzip PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) SET_TARGET_PROPERTIES(seven_zip PROJECT_LABEL "Library: Seven Zip" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") + LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt" ENDIF(WIN32) -ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -D_SZ_ONE_DIRECTORY) +ADD_DEFINITIONS(-D_SZ_ONE_DIRECTORY) + +INSTALL(TARGETS ryzom_sevenzip LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) INSTALL(TARGETS 7zDec RUNTIME DESTINATION bin COMPONENT client) diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt index 843e3048a..a9f1ec401 100644 --- a/code/ryzom/common/src/game_share/CMakeLists.txt +++ b/code/ryzom/common/src/game_share/CMakeLists.txt @@ -8,16 +8,16 @@ LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp) LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h) IF(WIN32) - ADD_LIBRARY(game_share STATIC ${SRC}) + ADD_LIBRARY(ryzom_gameshare STATIC ${SRC}) ELSE(WIN32) - ADD_LIBRARY(game_share SHARED ${SRC}) + ADD_LIBRARY(ryzom_gameshare SHARED ${SRC}) ENDIF(WIN32) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) -TARGET_LINK_LIBRARIES(game_share - ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} +TARGET_LINK_LIBRARIES(ryzom_gameshare + ${NELMISC_LIBRARY} ${NELNET_LIBRARY} ${NELLIGO_LIBRARY} ${NELGEORGES_LIBRARY} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) -SET_TARGET_PROPERTIES(game_share PROPERTIES VERSION ${NL_VERSION}) +SET_TARGET_PROPERTIES(ryzom_gameshare PROPERTIES VERSION ${NL_VERSION}) IF(WIN32) # SET_TARGET_PROPERTIES(${GAME_SHARE_LIB} PROPERTIES COMPILE_FLAGS "/Yustdgeorges.h") @@ -26,10 +26,10 @@ IF(WIN32) PROJECT_LABEL "Library: Game Share" DEBUG_POSTFIX "_d" RELEASE_POSTFIX "_r" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrt" - LINK_FLAGS_RELEASE "/NODEFAULTLIB:libc;libcmt;libcmtd;msvcrtd") + LINK_FLAGS_DEBUG "/NODEFAULTLIB:msvcrt") ENDIF(WIN32) ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) -INSTALL(TARGETS game_share LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) +INSTALL(TARGETS ryzom_gameshare LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries) +