fix cmake/ACE for freeBSD and Mac OSX
--HG-- branch : trunk
This commit is contained in:
@@ -13,15 +13,23 @@ WorldRunnable.cpp
|
||||
WorldRunnable.h
|
||||
)
|
||||
|
||||
SET(trinity-core_LINK_FLAGS "")
|
||||
|
||||
add_executable(trinity-core ${trinity-core_SRCS})
|
||||
add_definitions(
|
||||
-D_TRINITY_CORE_CONFIG='"${CONF_DIR}/trinitycore.conf"'
|
||||
)
|
||||
IF (DO_MYSQL)
|
||||
SET_TARGET_PROPERTIES(trinity-core PROPERTIES LINK_FLAGS "-pthread")
|
||||
SET(trinity-core_LINK_FLAGS "-pthread ${trinity-core_LINK_FLAGS}")
|
||||
ENDIF(DO_MYSQL)
|
||||
|
||||
|
||||
IF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
SET(trinity-core_LINK_FLAGS "-framework Carbon ${trinity-core_LINK_FLAGS}")
|
||||
SET(SCRIPT_LIB "")
|
||||
ENDIF (CMAKE_SYSTEM_NAME MATCHES "Darwin")
|
||||
|
||||
SET_TARGET_PROPERTIES(trinity-core PROPERTIES LINK_FLAGS "${trinity-core_LINK_FLAGS}")
|
||||
|
||||
target_link_libraries(
|
||||
trinity-core
|
||||
@@ -42,6 +50,7 @@ ${POSTGRE_LIBS}
|
||||
${SSLLIB}
|
||||
${ACE_LIBRARY}
|
||||
${ZLIB}
|
||||
${OSX_LIBS}
|
||||
)
|
||||
|
||||
install(TARGETS trinity-core DESTINATION bin)
|
||||
|
||||
Reference in New Issue
Block a user