[Cleanup] Shared Final

This is the final commit to the Shared folder
This commit is contained in:
Foereaper 2015-03-23 22:07:19 +01:00
parent 532c701228
commit f51e270008

View File

@ -50,16 +50,10 @@ source_group("Threading" FILES ${SRC_GRP_THREAD})
file(GLOB_RECURSE SRC_GRP_UTIL Utilities/*.cpp Utilities/*.h) file(GLOB_RECURSE SRC_GRP_UTIL Utilities/*.cpp Utilities/*.h)
source_group("Utilities" FILES ${SRC_GRP_UTIL}) source_group("Utilities" FILES ${SRC_GRP_UTIL})
# Windows specific files
file(GLOB_RECURSE SRC_GRP_WIN Win/*.cpp Win/*.h)
# Linux specific files
file(GLOB_RECURSE SRC_GRP_LINUX Linux/*.cpp Linux/*.h)
set(LIBRARY_SRCS set(LIBRARY_SRCS
${SRC_GRP_AUTH} ${SRC_GRP_AUTH}
${SRC_GRP_CONFIG}
${SRC_GRP_COMMON} ${SRC_GRP_COMMON}
${SRC_GRP_CONFIG}
${SRC_GRP_DATABASE} ${SRC_GRP_DATABASE}
${SRC_GRP_DATASTORE} ${SRC_GRP_DATASTORE}
${SRC_GRP_LOCKQ} ${SRC_GRP_LOCKQ}
@ -72,44 +66,40 @@ set(LIBRARY_SRCS
# OS specific files # OS specific files
if(WIN32) if(WIN32)
set(LIBRARY_SRCS file(GLOB_RECURSE SRC_GRP_WIN Win/*.cpp Win/*.h)
${LIBRARY_SRCS} LIST(APPEND LIBRARY_SRCS ${SRC_GRP_WIN})
${SRC_GRP_WIN}
)
else() else()
set(LIBRARY_SRCS file(GLOB_RECURSE SRC_GRP_LINUX Linux/*.cpp Linux/*.h)
${LIBRARY_SRCS} LIST(APPEND LIBRARY_SRCS ${SRC_GRP_LINUX})
${SRC_GRP_LINUX}
)
endif() endif()
include_directories( include_directories(
"${CMAKE_CURRENT_SOURCE_DIR}" ${CMAKE_CURRENT_SOURCE_DIR}
"${CMAKE_SOURCE_DIR}/dep" ${CMAKE_SOURCE_DIR}/dep
"${CMAKE_SOURCE_DIR}/src/framework" ${CMAKE_SOURCE_DIR}/src/framework
"${CMAKE_BINARY_DIR}" ${CMAKE_BINARY_DIR}
"${ACE_INCLUDE_DIR}" ${ACE_INCLUDE_DIR}
"${OPENSSL_INCLUDE_DIR}" ${OPENSSL_INCLUDE_DIR}
) )
if(POSTGRESQL) if(POSTGRESQL)
include_directories("${PostgreSQL_INCLUDE_DIRS}") include_directories(${PostgreSQL_INCLUDE_DIRS})
else() else()
include_directories("${MYSQL_INCLUDE_DIR}") include_directories(${MYSQL_INCLUDE_DIR})
endif() endif()
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/SystemConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/SystemConfig.h") configure_file("${CMAKE_CURRENT_SOURCE_DIR}/SystemConfig.h.in" "${CMAKE_CURRENT_BINARY_DIR}/SystemConfig.h")
add_library(${LIBRARY_NAME} STATIC add_library(${LIBRARY_NAME} STATIC
${LIBRARY_SRCS} ${LIBRARY_SRCS}
) )
if(POSTGRESQL) if(POSTGRESQL)
target_link_libraries(${LIBRARY_NAME} ${PostgreSQL_LIBRARIES}) target_link_libraries(${LIBRARY_NAME} ${PostgreSQL_LIBRARIES})
else() else()
target_link_libraries(${LIBRARY_NAME} ${MYSQL_LIBRARY}) target_link_libraries(${LIBRARY_NAME} ${MYSQL_LIBRARY})
endif() endif()
if(NOT ACE_USE_EXTERNAL) if(NOT ACE_USE_EXTERNAL)
add_dependencies(${LIBRARY_NAME} ace) add_dependencies(${LIBRARY_NAME} ace)
endif() endif()