Changeset - 0ad14c796e67
Parent rev.
Child rev.
[Not reviewed]
0 4 0
Vitaly Takmazov - 14 years ago 2011-10-13 08:42:57
vitalyster@gmail.com
fixed compilation of transport and spectrum2 targets
4 files changed with 41 insertions and 8 deletions:
CMakeLists.txt
17
3
spectrum/src/main.cpp
8
5
src/CMakeLists.txt
10
src/config.cpp
6
0 comments (0 inline, 0 general)
CMakeLists.txt
➞
Show inline comments
 
@@ -18,26 +18,33 @@ find_package(purple)
 
set(glib_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 
find_package(glib)
 

			




	
	
	
		
 
set(popt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(popt)

			




	
	
	
		
 

			




	
	
	
		
 
set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(event)

			




	
	
	
		
 

			




	
	
	
		
 
set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(Swiften REQUIRED)

			




	
	
	
		
 

			




	
	
	
		
 
find_package(openssl REQUIRED)

			




	
	
	
		
 

			




	
	
	
		
 
set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(Boost COMPONENTS date_time system filesystem regex thread signals REQUIRED)

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
set(Boost_USE_STATIC_LIBS        ON)

			




	
	
	
		
 
set(Boost_USE_MULTITHREADED      ON)

			




	
	
	
		
 
set(Boost_USE_STATIC_RUNTIME    OFF)

			




	
	
	
		
 
endif()

			




	
	
	
		
 
find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)

			




	
	
	
		
 
message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")

			




	
	
	
		
 

			




	
	
	
		
 
set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(Protobuf REQUIRED)

			




	
	
	
		
 

			




	
	
	
		
 
set(IRCClientQt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(IRCClientQt)

			




	
	
	
		
 

			




	
	
	
		
 
set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
	
		
 
find_package(log4cxx)

			




	
	
	
		
 

			




	
	
	
		
 
set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")

			




	
	
		
 
@@ -109,54 +116,61 @@ else()

			




	
	
	
		
 
	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")

			




	
	
	
		
 
	message("IRC plugin        : no (install libircclient-qt and libprotobuf-dev)")

			




	
	
	
		
 
	message("Frotz plugin      : no (install libprotobuf-dev)")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (LOG4CXX_FOUND)

			




	
	
	
		
 
	message("Logging           : yes")

			




	
	
	
		
 
	include_directories(${LOG4CXX_INCLUDE_DIR})

			




	
	
	
		
 
else()

			




	
	
	
		
 
	message(FATAL_ERROR "Logging           : no (install log4cxx-devel)")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
ADD_DEFINITIONS(-D_WIN32_WINNT=0x501)

			




	
	
	
		
 
ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if(CMAKE_BUILD_TYPE MATCHES Debug)

			




	
	
	
		
 
if (CMAKE_COMPILER_IS_GNUCXX)

			




	
	
	
		
 
	ADD_DEFINITIONS(-O3)

			




	
	
	
		
 
	ADD_DEFINITIONS(-ggdb)

			




	
	
	
		
 
	ADD_DEFINITIONS(-DDEBUG)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wall)

			




	
	
	
		
 
	ADD_DEFINITIONS(-W)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wcast-align)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wextra -Wno-sign-compare -Wno-unused-parameter)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Winit-self)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wmissing-declarations)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wpointer-arith)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wreorder)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Woverloaded-virtual)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wsign-promo)

			




	
	
	
		
 
	ADD_DEFINITIONS(-Wundef -Wunused)

			




	
	
	
		
 
endif()

			




	
	
	
		
 
	ADD_DEFINITIONS(-DDEBUG)

			




	
	
	
		
 
	message("Debug             : yes")

			




	
	
	
		
 
else(CMAKE_BUILD_TYPE MATCHES Debug)

			




	
	
	
		
 
	message("Debug             : no (run \"cmake . -DCMAKE_BUILD_TYPE=Debug\")")

			




	
	
	
		
 
endif(CMAKE_BUILD_TYPE MATCHES Debug)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
SET(TRANSPORT_VERSION 2.0)

			




	
	
	
		
 
SET(PROJECT_VERSION 2.0)

			




	
	
	
		
 
include_directories(include)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
include_directories(${EVENT_INCLUDE_DIRS})

			




	
	
	
		
 
include_directories(${SWIFTEN_INCLUDE_DIR})

			




	
	
	
		
 
include_directories(${Boost_INCLUDE_DIRS})

			




	
	
	
		
 

			




	
	
	
		
 
include_directories(${OPENSSL_INCLUDE_DIR})

			




	
	
	
		
 

			




	
	
	
		
 
ADD_SUBDIRECTORY(src)

			




	
	
	
		
 
ADD_SUBDIRECTORY(include)

			




	
	
	
		
 
#ADD_SUBDIRECTORY(examples)

			




	
	
	
		
 
ADD_SUBDIRECTORY(spectrum)

			




	
	
	
		
 
ADD_SUBDIRECTORY(backends)

			




	
	
	
		
 
#ADD_SUBDIRECTORY(tests)

			




	
	
	
		
 
ADD_SUBDIRECTORY(spectrum_manager)

			




	
	
	
		
 

			




	
	
	
		
 
if (CPPUNIT_FOUND)

			




	
	
	
		
 
	message("tests             : yes")

			




	
	
	
		
 
	include_directories(${CPPUNIT_INCLUDE_DIR})

			




        

    


    
    

    

        

                

                    spectrum/src/main.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,35 +7,35 @@

			




	
	
	
		
 
#include "transport/mysqlbackend.h"

			




	
	
	
		
 
#include "transport/userregistration.h"

			




	
	
	
		
 
#include "transport/networkpluginserver.h"

			




	
	
	
		
 
#include "transport/admininterface.h"

			




	
	
	
		
 
#include "transport/util.h"

			




	
	
	
		
 
#include "Swiften/EventLoop/SimpleEventLoop.h"

			




	
	
	
		
 
#include <boost/filesystem.hpp>

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
#include "sys/signal.h"

			




	
	
	
		
 
#include <pwd.h>

			




	
	
	
		
 
#include <grp.h>

			




	
	
	
		
 
#include <sys/resource.h>

			




	
	
	
		
 
#include "libgen.h"

			




	
	
	
		
 
#else

			




	
	
	
		
 
#include <Windows.h>

			




	
	
	
		
 
#include <tchar.h>

			




	
	
	
		
 
#include <windows.h>

			




	
	
	
		
 
#endif

			




	
	
	
		
 
#include "log4cxx/logger.h"

			




	
	
	
		
 
#include "log4cxx/consoleappender.h"

			




	
	
	
		
 
#include "log4cxx/patternlayout.h"

			




	
	
	
		
 
#include "log4cxx/propertyconfigurator.h"

			




	
	
	
		
 
#include "log4cxx/helpers/properties.h"

			




	
	
	
		
 
#include "log4cxx/helpers/transcoder.h"

			




	
	
	
		
 
#include "log4cxx/helpers/fileinputstream.h"

			




	
	
	
		
 
#include "libgen.h"

			




	
	
	
		
 
#include <sys/stat.h>

			




	
	
	
		
 

			




	
	
	
		
 
using namespace log4cxx;

			




	
	
	
		
 

			




	
	
	
		
 
using namespace Transport;

			




	
	
	
		
 

			




	
	
	
		
 
static LoggerPtr logger = log4cxx::Logger::getLogger("Spectrum");

			




	
	
	
		
 

			




	
	
	
		
 
Swift::SimpleEventLoop *eventLoop_ = NULL;

			




	
	
	
		
 
Component *component_ = NULL;

			




	
	
	
		
 
UserManager *userManager_ = NULL;

			




	
	
	
		
 

			




	
	
		
 
@@ -216,26 +216,29 @@ int main(int argc, char **argv)

			




	
	
	
		
 
		LoggerPtr root = log4cxx::Logger::getRootLogger();

			




	
	
	
		
 
#ifdef WIN32

			




	
	
	
		
 
		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));

			




	
	
	
		
 
#else

			




	
	
	
		
 
		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));

			




	
	
	
		
 
#endif

			




	
	
	
		
 
	}

			




	
	
	
		
 
	else {

			




	
	
	
		
 
		log4cxx::helpers::Properties p;

			




	
	
	
		
 
		log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(&config, "logging.config"));

			




	
	
	
		
 

			




	
	
	
		
 
		p.load(istream);

			




	
	
	
		
 
		p.setProperty("pid", boost::lexical_cast<std::string>(getpid()));

			




	
	
	
		
 
		p.setProperty("jid", CONFIG_STRING(&config, "service.jid"));

			




	
	
	
		
 
		LogString pid, jid;

			




	
	
	
		
 
		log4cxx::helpers::Transcoder::decode(boost::lexical_cast<std::string>(getpid()), pid);

			




	
	
	
		
 
		log4cxx::helpers::Transcoder::decode(CONFIG_STRING(&config, "service.jid"), jid);

			




	
	
	
		
 
		p.setProperty(L"pid", pid);

			




	
	
	
		
 
		p.setProperty(L"jid", jid);

			




	
	
	
		
 
		log4cxx::PropertyConfigurator::configure(p);

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




	
	
	
		
 
#ifndef WIN32

			




	
	
	
		
 
	if (!CONFIG_STRING(&config, "service.group").empty() ||!CONFIG_STRING(&config, "service.user").empty() ) {

			




	
	
	
		
 
		struct rlimit limit;

			




	
	
	
		
 
		getrlimit(RLIMIT_CORE, &limit);

			




	
	
	
		
 

			




	
	
	
		
 
		if (!CONFIG_STRING(&config, "service.group").empty()) {

			




	
	
	
		
 
			struct group *gr;

			




	
	
	
		
 
			if ((gr = getgrnam(CONFIG_STRING(&config, "service.group").c_str())) == NULL) {

			




	
	
	
		
 
				LOG4CXX_ERROR(logger, "Invalid service.group name " << CONFIG_STRING(&config, "service.group"));

			




        

    


    
    

    

        

                

                    src/CMakeLists.txt
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,29 +6,39 @@ FILE(GLOB HEADERS ../include/transport/*.h)

			




	
	
	
		
 
if (PROTOBUF_FOUND)

			




	
	
	
		
 
	PROTOBUF_GENERATE_CPP(PROTOBUF_SRC PROTOBUF_HDRS "pbnetwork.proto")

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (CPPUNIT_FOUND)

			




	
	
	
		
 
	FILE(GLOB SRC_TEST tests/*.cpp)

			




	
	
	
		
 

			




	
	
	
		
 
	ADD_EXECUTABLE(libtransport_test ${SRC_TEST})

			




	
	
	
		
 

			




	
	
	
		
 
	target_link_libraries(libtransport_test transport ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (NOT WIN32)

			




	
	
	
		
 
include_directories(${POPT_INCLUDE_DIR})

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
# SOURCE_GROUP(headers FILES ${HEADERS})

			




	
	
	
		
 

			




	
	
	
		
 
if (CMAKE_COMPILER_IS_GNUCXX)

			




	
	
	
		
 
ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS})

			




	
	
	
		
 
ADD_DEFINITIONS(-fPIC)

			




	
	
	
		
 
else()

			




	
	
	
		
 
ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${PROTOBUF_SRC} ${PROTOBUF_HDRS})

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
if (WIN32)

			




	
	
	
		
 
TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES})

			




	
	
	
		
 
else ()

			




	
	
	
		
 
TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})

			




	
	
	
		
 
endif()

			




	
	
	
		
 

			




	
	
	
		
 
SET_TARGET_PROPERTIES(transport PROPERTIES

			




	
	
	
		
 
      VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}

			




	
	
	
		
 
)

			




	
	
	
		
 

			




	
	
	
		
 
INSTALL(TARGETS transport LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)

			




	
	
	
		
 

			




	
	
	
		
 
#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")

			




	
	
	
		
 
#INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)

			




        

    


    
    

    

        

                

                    src/config.cpp
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -11,24 +11,30 @@

			




	
	
	
		
 
 * This program is distributed in the hope that it will be useful,

			




	
	
	
		
 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of

			




	
	
	
		
 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

			




	
	
	
		
 
 * GNU General Public License for more details.

			




	
	
	
		
 
 *

			




	
	
	
		
 
 * You should have received a copy of the GNU General Public License

			




	
	
	
		
 
 * along with this program; if not, write to the Free Software

			




	
	
	
		
 
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA

			




	
	
	
		
 
 */

			




	
	
	
		
 

			




	
	
	
		
 
#include "transport/config.h"

			




	
	
	
		
 
#include <fstream>

			




	
	
	
		
 
#ifdef _MSC_VER

			




	
	
	
		
 
#include <direct.h>

			




	
	
	
		
 
#define getcwd _getcwd

			




	
	
	
		
 
#include <windows.h>

			




	
	
	
		
 
#define PATH_MAX MAX_PATH

			




	
	
	
		
 
#endif

			




	
	
	
		
 

			




	
	
	
		
 
using namespace boost::program_options;

			




	
	
	
		
 

			




	
	
	
		
 
namespace Transport {

			




	
	
	
		
 

			




	
	
	
		
 
bool Config::load(const std::string &configfile, boost::program_options::options_description &opts) {

			




	
	
	
		
 
	std::ifstream ifs(configfile.c_str());

			




	
	
	
		
 
	if (!ifs.is_open())

			




	
	
	
		
 
		return false;

			




	
	
	
		
 

			




	
	
	
		
 
	m_file = configfile;

			




	
	
	
		
 
	bool ret = load(ifs, opts);

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: srv01-3934
    
    
        This site is powered by
            Kallithea,
        which is
        © 2010–2021 by various authors & licensed under GPLv3.
            – Support