diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-20 16:59:07 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-03-20 16:59:07 +0000 |
| commit | ee36fd725c890c5156f1d777368eeb84d5a3922e (patch) | |
| tree | bdbec3c90830fa82e78774f62032896de7a2ba1a /src/map/sql | |
| parent | 78fe9886d39b11a38903ffc513a70fa2b00e43f3 (diff) | |
| download | hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.tar.gz hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.tar.bz2 hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.tar.xz hercules-ee36fd725c890c5156f1d777368eeb84d5a3922e.zip | |
- Fixed CMake compilation (libconfig integrated into common_base).
- Chanced libconfig.h include directives to double-quoted form (never use the system version of libconfig.h).
- Removed ShowError/ShowNotice from sig plugin (showmsg.c depends on core.c).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15737 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/sql')
| -rw-r--r-- | src/map/sql/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt index 20383e320..0d33cb419 100644 --- a/src/map/sql/CMakeLists.txt +++ b/src/map/sql/CMakeLists.txt @@ -81,8 +81,8 @@ set( SQL_MAP_SOURCES ) set( DEPENDENCIES common_sql ) set( LIBRARIES ${GLOBAL_LIBRARIES} ) -set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${LIBCONFIG_INCLUDE_DIRS} ) -set( DEFINITIONS "${GLOBAL_DEFINITIONS}" ) +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} ) @@ -91,7 +91,7 @@ if( WITH_PCRE ) else() message( STATUS "Disabled PCRE code" ) endif() -set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} ${LIBCONFIG_HEADERS} ${LIBCONFIG_SOURCES} ) +set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ) source_group( map FILES ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} ) include_directories( ${INCLUDE_DIRS} ) |