Cleanup and harmonize cmake.

src/char/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 # setup
 #
-set( SERVER_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}  CACHE INTERNAL "" )
+set( CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}  CACHE INTERNAL "" )
 
 
 #
@@ -9,46 +9,11 @@ set( SERVER_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}  CACHE INTERNAL "" )
 #
 if( BUILD_SERVERS )
 message( STATUS "Creating target char-server" )
-set( CHAR_HEADERS
-	"${SERVER_CHAR_SOURCE_DIR}/char.h"
-	"${SERVER_CHAR_SOURCE_DIR}/char_clif.h"
-	"${SERVER_CHAR_SOURCE_DIR}/char_cnslif.h"
-	"${SERVER_CHAR_SOURCE_DIR}/char_logif.h"
-	"${SERVER_CHAR_SOURCE_DIR}/char_mapif.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_achievement.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_auction.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_clan.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_elemental.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_guild.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_homun.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_mail.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_mercenary.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_party.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_pet.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_quest.h"
-	"${SERVER_CHAR_SOURCE_DIR}/int_storage.h"
-	"${SERVER_CHAR_SOURCE_DIR}/inter.h"
-	)
-set( CHAR_SOURCES
-	"${SERVER_CHAR_SOURCE_DIR}/char.cpp"
-	"${SERVER_CHAR_SOURCE_DIR}/char_clif.c"
-	"${SERVER_CHAR_SOURCE_DIR}/char_cnslif.c"
-	"${SERVER_CHAR_SOURCE_DIR}/char_logif.c"
-	"${SERVER_CHAR_SOURCE_DIR}/char_mapif.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_achievement.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_auction.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_clan.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_elemental.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_guild.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_homun.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_mail.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_mercenary.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_party.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_pet.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_quest.c"
-	"${SERVER_CHAR_SOURCE_DIR}/int_storage.cpp"
-	"${SERVER_CHAR_SOURCE_DIR}/inter.cpp"
-	)
+file(GLOB CHAR_HEADERS ${CHAR_SOURCE_DIR}/*.h)
+file(GLOB CHAR_SOURCES_C ${CHAR_SOURCE_DIR}/*.c)
+file(GLOB CHAR_SOURCES_CXX ${CHAR_SOURCE_DIR}/*.cpp)
+set(CHAR_SOURCES ${CHAR_SOURCES_C} ${CHAR_SOURCES_CXX})
+#message( STATUS "CHAR_SOURCES="${CHAR_SOURCES})
 set( DEPENDENCIES common )
 set( LIBRARIES ${GLOBAL_LIBRARIES} )
 set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )

src/login/CMakeLists.txt

@@ -7,24 +7,11 @@ set( LOGIN_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}  CACHE INTERNAL "" )
 #
 if( BUILD_SERVERS )
 message( STATUS "Creating target login-server" )
-set( LOGIN_HEADERS
-	"${LOGIN_SOURCE_DIR}/account.h"
-	"${LOGIN_SOURCE_DIR}/ipban.h"
-	"${LOGIN_SOURCE_DIR}/login.h"
-	"${LOGIN_SOURCE_DIR}/loginclif.h"
-	"${LOGIN_SOURCE_DIR}/loginchrif.h"
-	"${LOGIN_SOURCE_DIR}/logincnslif.h"
-	"${LOGIN_SOURCE_DIR}/loginlog.h"
-	)
-set( LOGIN_SOURCES
-	"${LOGIN_SOURCE_DIR}/account.c"
-	"${LOGIN_SOURCE_DIR}/ipban.c"
-	"${LOGIN_SOURCE_DIR}/login.cpp"
-	"${LOGIN_SOURCE_DIR}/loginclif.c"
-	"${LOGIN_SOURCE_DIR}/loginchrif.c"
-	"${LOGIN_SOURCE_DIR}/logincnslif.c"
-	"${LOGIN_SOURCE_DIR}/loginlog.c"
-	)
+file(GLOB LOGIN_HEADERS ${LOGIN_SOURCE_DIR}/*.h)
+file(GLOB LOGIN_SOURCES_C ${LOGIN_SOURCE_DIR}/*.c)
+file(GLOB LOGIN_SOURCES_CXX ${LOGIN_SOURCE_DIR}/*.cpp)
+set(LOGIN_SOURCES ${LOGIN_SOURCES_C} ${LOGIN_SOURCES_CXX})
+#message( STATUS "LOGIN_SOURCES="${LOGIN_SOURCES})
 set( DEPENDENCIES common )
 set( LIBRARIES ${GLOBAL_LIBRARIES} )
 set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )

src/login/server/CMakeLists.txt

@@ -1,45 +0,0 @@
-
-#
-# login server
-#
-if( BUILD_SERVERS )
-message( STATUS "Creating target login-server" )
-set( LOGIN_HEADERS
-	"${SERVER_LOGIN_SOURCE_DIR}/account.h"
-	"${SERVER_LOGIN_SOURCE_DIR}/ipban.h"
-	"${SERVER_LOGIN_SOURCE_DIR}/login.h"
-	"${SERVER_LOGIN_SOURCE_DIR}/loginclif.h"
-	"${SERVER_LOGIN_SOURCE_DIR}/loginchrif.h"
-	"${SERVER_LOGIN_SOURCE_DIR}/logincnslif.h"
-	"${SERVER_LOGIN_SOURCE_DIR}/loginlog.h"
-	)
-set( LOGIN_SOURCES
-	"${SERVER_LOGIN_SOURCE_DIR}/account.c"
-	"${SERVER_LOGIN_SOURCE_DIR}/ipban.c"
-	"${SERVER_LOGIN_SOURCE_DIR}/login.c"
-	"${SERVER_LOGIN_SOURCE_DIR}/loginclif.c"
-	"${SERVER_LOGIN_SOURCE_DIR}/loginchrif.c"
-	"${SERVER_LOGIN_SOURCE_DIR}/logincnslif.c"
-	"${SERVER_LOGIN_SOURCE_DIR}/loginlog.c"
-	)
-set( DEPENDENCIES common )
-set( LIBRARIES ${GLOBAL_LIBRARIES} )
-set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
-set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS} -DWITH_SQL" )
-set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
-source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
-source_group( login FILES ${LOGIN_HEADERS} ${LOGIN_SOURCES} )
-include_directories( ${INCLUDE_DIRS} )
-add_executable( login-server ${SOURCE_FILES} )
-add_dependencies( login-server ${DEPENDENCIES} )
-target_link_libraries( login-server ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( login-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
-if( INSTALL_COMPONENT_RUNTIME )
-	cpack_add_component( Runtime_loginserver DESCRIPTION "login-server" DISPLAY_NAME "login-server" GROUP Runtime )
-	install( TARGETS login-server
-		DESTINATION "."
-		COMPONENT Runtime_loginserver )
-endif( INSTALL_COMPONENT_RUNTIME )
-set( TARGET_LIST ${TARGET_LIST} login-server  CACHE INTERNAL "" )
-message( STATUS "Creating target login-server - done" )
-endif( BUILD_SERVERS )

src/map/server/CMakeLists.txt

@@ -1,116 +0,0 @@
-
-#
-# map server
-#
-if( BUILD_SERVERS )
-message( STATUS "Creating target map-server" )
-set( MAP_HEADERS
-	"${SERVER_MAP_SOURCE_DIR}/atcommand.h"
-	"${SERVER_MAP_SOURCE_DIR}/battle.h"
-	"${SERVER_MAP_SOURCE_DIR}/battleground.h"
-	"${SERVER_MAP_SOURCE_DIR}/buyingstore.h"
-	"${SERVER_MAP_SOURCE_DIR}/chat.h"
-	"${SERVER_MAP_SOURCE_DIR}/chrif.h"
-	"${SERVER_MAP_SOURCE_DIR}/clif.h"
-	"${SERVER_MAP_SOURCE_DIR}/date.h"
-	"${SERVER_MAP_SOURCE_DIR}/duel.h"
-	"${SERVER_MAP_SOURCE_DIR}/elemental.h"
-	"${SERVER_MAP_SOURCE_DIR}/guild.h"
-	"${SERVER_MAP_SOURCE_DIR}/homunculus.h"
-	"${SERVER_MAP_SOURCE_DIR}/instance.h"
-	"${SERVER_MAP_SOURCE_DIR}/intif.h"
-	"${SERVER_MAP_SOURCE_DIR}/itemdb.h"
-	"${SERVER_MAP_SOURCE_DIR}/log.h"
-	"${SERVER_MAP_SOURCE_DIR}/mail.h"
-	"${SERVER_MAP_SOURCE_DIR}/map.h"
-	"${SERVER_MAP_SOURCE_DIR}/mapreg.h"
-	"${SERVER_MAP_SOURCE_DIR}/mercenary.h"
-	"${SERVER_MAP_SOURCE_DIR}/mob.h"
-	"${SERVER_MAP_SOURCE_DIR}/npc.h"
-	"${SERVER_MAP_SOURCE_DIR}/party.h"
-	"${SERVER_MAP_SOURCE_DIR}/path.h"
-	"${SERVER_MAP_SOURCE_DIR}/pc.h"
-	"${SERVER_MAP_SOURCE_DIR}/pc_groups.h"
-	"${SERVER_MAP_SOURCE_DIR}/pet.h"
-	"${SERVER_MAP_SOURCE_DIR}/quest.h"
-	"${SERVER_MAP_SOURCE_DIR}/script.h"
-	"${SERVER_MAP_SOURCE_DIR}/searchstore.h"
-	"${SERVER_MAP_SOURCE_DIR}/skill.h"
-	"${SERVER_MAP_SOURCE_DIR}/status.h"
-	"${SERVER_MAP_SOURCE_DIR}/storage.h"
-	"${SERVER_MAP_SOURCE_DIR}/trade.h"
-	"${SERVER_MAP_SOURCE_DIR}/unit.h"
-	"${SERVER_MAP_SOURCE_DIR}/vending.h"
-	"${SERVER_MAP_SOURCE_DIR}/cashshop.h"
-	"${SERVER_MAP_SOURCE_DIR}/channel.h"
-	)
-set( MAP_SOURCES
-	"${SERVER_MAP_SOURCE_DIR}/atcommand.c"
-	"${SERVER_MAP_SOURCE_DIR}/battle.c"
-	"${SERVER_MAP_SOURCE_DIR}/battleground.c"
-	"${SERVER_MAP_SOURCE_DIR}/buyingstore.c"
-	"${SERVER_MAP_SOURCE_DIR}/chat.c"
-	"${SERVER_MAP_SOURCE_DIR}/chrif.c"
-	"${SERVER_MAP_SOURCE_DIR}/clif.c"
-	"${SERVER_MAP_SOURCE_DIR}/date.c"
-	"${SERVER_MAP_SOURCE_DIR}/duel.c"
-	"${SERVER_MAP_SOURCE_DIR}/elemental.c"
-	"${SERVER_MAP_SOURCE_DIR}/guild.c"
-	"${SERVER_MAP_SOURCE_DIR}/homunculus.c"
-	"${SERVER_MAP_SOURCE_DIR}/instance.c"
-	"${SERVER_MAP_SOURCE_DIR}/intif.c"
-	"${SERVER_MAP_SOURCE_DIR}/itemdb.c"
-	"${SERVER_MAP_SOURCE_DIR}/log.c"
-	"${SERVER_MAP_SOURCE_DIR}/mail.c"
-	"${SERVER_MAP_SOURCE_DIR}/map.c"
-	"${SERVER_MAP_SOURCE_DIR}/mapreg.c"
-	"${SERVER_MAP_SOURCE_DIR}/mercenary.c"
-	"${SERVER_MAP_SOURCE_DIR}/mob.c"
-	"${SERVER_MAP_SOURCE_DIR}/npc.c"
-	"${SERVER_MAP_SOURCE_DIR}/npc_chat.c"
-	"${SERVER_MAP_SOURCE_DIR}/party.c"
-	"${SERVER_MAP_SOURCE_DIR}/path.c"
-	"${SERVER_MAP_SOURCE_DIR}/pc.c"
-	"${SERVER_MAP_SOURCE_DIR}/pc_groups.c"
-	"${SERVER_MAP_SOURCE_DIR}/pet.c"
-	"${SERVER_MAP_SOURCE_DIR}/quest.c"
-	"${SERVER_MAP_SOURCE_DIR}/script.c"
-	"${SERVER_MAP_SOURCE_DIR}/searchstore.c"
-	"${SERVER_MAP_SOURCE_DIR}/skill.c"
-	"${SERVER_MAP_SOURCE_DIR}/status.c"
-	"${SERVER_MAP_SOURCE_DIR}/storage.c"
-	"${SERVER_MAP_SOURCE_DIR}/trade.c"
-	"${SERVER_MAP_SOURCE_DIR}/unit.c"
-	"${SERVER_MAP_SOURCE_DIR}/vending.c"
-	"${SERVER_MAP_SOURCE_DIR}/cashshop.c"
-	"${SERVER_MAP_SOURCE_DIR}/channel.c"
-	)
-set( DEPENDENCIES common )
-set( LIBRARIES ${GLOBAL_LIBRARIES} )
-set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
-set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
-if( WITH_PCRE )
-	message( STATUS "Enabled PCRE code" )
-	set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} )
-	set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} )
-	set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" )
-else()
-	message( STATUS "Disabled PCRE code" )
-endif()
-set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} ${MAP_HEADERS} ${MAP_SOURCES} )
-source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_HEADERS} )
-source_group( map FILES ${MAP_HEADERS} ${MAP_SOURCES} )
-include_directories( ${INCLUDE_DIRS} )
-add_executable( map-server ${SOURCE_FILES} )
-add_dependencies( map-server ${DEPENDENCIES} )
-target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} )
-set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" )
-if( INSTALL_COMPONENT_RUNTIME )
-	cpack_add_component( Runtime_mapserver DESCRIPTION "map-server" DISPLAY_NAME "map-server" GROUP Runtime )
-	install( TARGETS map-server
-		DESTINATION "."
-		COMPONENT Runtime_mapserver )
-endif( INSTALL_COMPONENT_RUNTIME )
-set( TARGET_LIST ${TARGET_LIST} map-server  CACHE INTERNAL "" )
-message( STATUS "Creating target map-server - done" )
-endif( BUILD_SERVERS )