From ee36fd725c890c5156f1d777368eeb84d5a3922e Mon Sep 17 00:00:00 2001
From: flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec>
Date: Tue, 20 Mar 2012 16:59:07 +0000
Subject: - 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
---
 src/common/CMakeLists.txt | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'src/common/CMakeLists.txt')

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index f7acda740..effd0b2ab 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -40,14 +40,17 @@ set( COMMON_MINI_HEADERS
 	"${COMMON_SOURCE_DIR}/malloc.h"
 	"${COMMON_SOURCE_DIR}/showmsg.h"
 	"${COMMON_SOURCE_DIR}/strlib.h"
+	${LIBCONFIG_HEADERS} # needed by showmsg.h
 	CACHE INTERNAL "" )
 set( COMMON_MINI_SOURCES
 	"${COMMON_SOURCE_DIR}/core.c"
 	"${COMMON_SOURCE_DIR}/malloc.c"
 	"${COMMON_SOURCE_DIR}/showmsg.c"
 	"${COMMON_SOURCE_DIR}/strlib.c"
+	${LIBCONFIG_SOURCES} # needed by showmsg.c
 	CACHE INTERNAL "" )
-set( COMMON_MINI_DEFINITIONS "-DMINICORE" CACHE INTERNAL "" )
+set( COMMON_MINI_INCLUDE_DIRS ${LIBCONFIG_INCLUDE_DIRS} CACHE INTERNAL "" )
+set( COMMON_MINI_DEFINITIONS "-DMINICORE ${LIBCONFIG_DEFINITIONS}" CACHE INTERNAL "" )
 
 
 #
@@ -75,6 +78,7 @@ set( COMMON_BASE_HEADERS
 	"${COMMON_SOURCE_DIR}/strlib.h"
 	"${COMMON_SOURCE_DIR}/timer.h"
 	"${COMMON_SOURCE_DIR}/utils.h"
+	${LIBCONFIG_HEADERS} # needed by conf.h/showmsg.h
 	CACHE INTERNAL "common_base headers" )
 set( COMMON_BASE_SOURCES
 	"${COMMON_SOURCE_DIR}/conf.c"
@@ -95,10 +99,17 @@ set( COMMON_BASE_SOURCES
 	"${COMMON_SOURCE_DIR}/strlib.c"
 	"${COMMON_SOURCE_DIR}/timer.c"
 	"${COMMON_SOURCE_DIR}/utils.c"
+	${LIBCONFIG_SOURCES} # needed by conf.c/showmsg.c
 	CACHE INTERNAL "common_base sources" )
+set( COMMON_BASE_INCLUDE_DIRS
+	${LIBCONFIG_INCLUDE_DIRS}
+	CACHE INTERNAL "common_base include dirs" )
+set( COMMON_BASE_DEFINITIONS
+	${LIBCONFIG_DEFINITIONS}
+	CACHE INTERNAL "common_base definitions" )
 set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} )
-set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${LIBCONFIG_INCLUDE_DIRS} )
-set( DEFINITIONS "${GLOBAL_DEFINITIONS}" )
+set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} )
+set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" )
 set( SOURCE_FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} )
 source_group( mt19937ar FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} )
 source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} )
-- 
cgit v1.2.3-70-g09d2