Merge: From default to build_pipeline_v3

--HG--
branch : build_pipeline_v3
hg/feature/build_pipeline_v3
kaetemi 13 years ago
commit b389f36f7e

@ -26,7 +26,7 @@ SOURCE_GROUP("R2" FILES ${R2})
LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp) LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h) LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC}) NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC} ${R2})
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

@ -8,7 +8,7 @@ LIST(REMOVE_ITEM SRC R2)
SOURCE_GROUP("" FILES ${SRC}) SOURCE_GROUP("" FILES ${SRC})
SOURCE_GROUP("R2" FILES ${R2}) SOURCE_GROUP("R2" FILES ${R2})
NL_TARGET_LIB(ryzom_servershare ${SRC}) NL_TARGET_LIB(ryzom_servershare ${SRC} ${R2}))
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})

Loading…
Cancel
Save