From 7cccaa282a29194e7e67c26a3b1e3d8dec7bea7d Mon Sep 17 00:00:00 2001 From: kervala Date: Fri, 3 Sep 2010 22:16:10 +0200 Subject: [PATCH] Fixed: Merged Windows and Mac OS executable types --- code/ryzom/client/src/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt index 4b2708caa..996263e2f 100644 --- a/code/ryzom/client/src/CMakeLists.txt +++ b/code/ryzom/client/src/CMakeLists.txt @@ -44,8 +44,6 @@ if(APPLE) SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0") SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community") - 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 ryzom_client POST_BUILD @@ -57,11 +55,10 @@ if(APPLE) # ${CMAKE_CURRENT_BINARY_DIR}/ryzom_client.app/Contents/Frameworks # # ... # # install_name_tool the lib pathes - -ELSE(APPLE) - ADD_EXECUTABLE(ryzom_client ${SRC}) ENDIF(APPLE) +ADD_EXECUTABLE(ryzom_client WIN32 MACOSX_BUNDLE ${SRC}) + INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR}