summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorgepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-02 19:57:29 +0000
committergepard1984 <gepard1984@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-03-02 19:57:29 +0000
commite27e10c71f915a69f83bf81b5d0911375313f055 (patch)
tree6cbdc9b7c153ebce6ee38e00475cc30a91fee5e3 /src/common
parent0e8da0a06a86128c2c2a9f663592e2a8e4980141 (diff)
downloadhercules-e27e10c71f915a69f83bf81b5d0911375313f055.tar.gz
hercules-e27e10c71f915a69f83bf81b5d0911375313f055.tar.bz2
hercules-e27e10c71f915a69f83bf81b5d0911375313f055.tar.xz
hercules-e27e10c71f915a69f83bf81b5d0911375313f055.zip
Updated CMakeLists (follow-up to r15572, r15586) (patch provided by Saithis, pid:82588).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15651 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3f04e5b04..d30a4e714 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -32,7 +32,6 @@ set( COMMON_ALL_HEADERS
"${COMMON_SOURCE_DIR}/cbasetypes.h"
"${COMMON_SOURCE_DIR}/mmo.h"
"${COMMON_SOURCE_DIR}/plugin.h"
- "${COMMON_SOURCE_DIR}/version.h"
)
set( COMMON_MINI_HEADERS
@@ -58,6 +57,7 @@ if( WITH_ZLIB )
message( STATUS "Creating target common_base" )
set( COMMON_BASE_HEADERS
${COMMON_ALL_HEADERS}
+ "${COMMON_SOURCE_DIR}/conf.h"
"${COMMON_SOURCE_DIR}/core.h"
"${COMMON_SOURCE_DIR}/db.h"
"${COMMON_SOURCE_DIR}/des.h"
@@ -77,6 +77,7 @@ set( COMMON_BASE_HEADERS
"${COMMON_SOURCE_DIR}/utils.h"
CACHE INTERNAL "common_base headers" )
set( COMMON_BASE_SOURCES
+ "${COMMON_SOURCE_DIR}/conf.c"
"${COMMON_SOURCE_DIR}/core.c"
"${COMMON_SOURCE_DIR}/db.c"
"${COMMON_SOURCE_DIR}/des.c"
@@ -96,7 +97,7 @@ set( COMMON_BASE_SOURCES
"${COMMON_SOURCE_DIR}/utils.c"
CACHE INTERNAL "common_base sources" )
set( LIBRARIES ${ZLIB_LIBRARIES} )
-set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} )
+set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${LIBCONFIG_INCLUDE_DIRS} )
set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
set( SOURCE_FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} )
source_group( mt19937ar FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} )