diff options
| author | shennetsind <ind@henn.et> | 2013-02-16 17:37:50 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-02-16 17:37:50 -0200 |
| commit | 78b4db8a026e9e16367daa12eac03955815ef94c (patch) | |
| tree | 813912e643c2ccaa180267a746a5d932cf2ae6a9 /src/map/sql | |
| parent | 484c1b6ac438e58c66f5ff16b09e2cf07c8e1981 (diff) | |
| download | hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.gz hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.bz2 hercules-78b4db8a026e9e16367daa12eac03955815ef94c.tar.xz hercules-78b4db8a026e9e16367daa12eac03955815ef94c.zip | |
Dropped _sql suffix in server names.
Updated .gitignore to reflect this change, also renamed some other stuff to make their functionality clearer.
Signed-off-by: shennetsind <ind@henn.et>
Diffstat (limited to 'src/map/sql')
| -rw-r--r-- | src/map/sql/CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt index 47c8e495c..1d8bd5fe2 100644 --- a/src/map/sql/CMakeLists.txt +++ b/src/map/sql/CMakeLists.txt @@ -3,7 +3,7 @@ # map sql # if( BUILD_SQL_SERVERS ) -message( STATUS "Creating target map-server_sql" ) +message( STATUS "Creating target map-server" ) set( SQL_MAP_HEADERS "${SQL_MAP_SOURCE_DIR}/atcommand.h" "${SQL_MAP_SOURCE_DIR}/battle.h" @@ -97,16 +97,16 @@ set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_MAP_HEADERS source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ) source_group( map FILES ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} ) include_directories( ${INCLUDE_DIRS} ) -add_executable( map-server_sql ${SOURCE_FILES} ) -add_dependencies( map-server_sql ${DEPENDENCIES} ) -target_link_libraries( map-server_sql ${LIBRARIES} ${DEPENDENCIES} ) -set_target_properties( map-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) +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_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server_sql" GROUP Runtime ) - install( TARGETS map-server_sql + cpack_add_component( Runtime_mapserver_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server" GROUP Runtime ) + install( TARGETS map-server DESTINATION "." COMPONENT Runtime_mapserver_sql ) endif( INSTALL_COMPONENT_RUNTIME ) -set( TARGET_LIST ${TARGET_LIST} map-server_sql CACHE INTERNAL "" ) -message( STATUS "Creating target map-server_sql - done" ) +set( TARGET_LIST ${TARGET_LIST} map-server CACHE INTERNAL "" ) +message( STATUS "Creating target map-server - done" ) endif( BUILD_SQL_SERVERS ) |