libtransport.git Changeset - 66c4de4c6453

Changeset - 66c4de4c6453

Parent rev.

Child rev.

[Not reviewed]

0 1 0

HanzZ - 13 years ago 2012-09-04 19:59:41
hanzz.k@gmail.com

Removed GLIB2* config variables

1 file changed with 4 insertions and 5 deletions:

CMakeLists.txt

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

 cmake_minimum_required(VERSION 2.6)
 project(libtransport)
 message(STATUS "Variables to override default places where to find libraries:")
 message(STATUS "|- cppunit : -DCPPUNIT_INCLUDE_DIR,  -DCPPUNIT_LIBRARY")
 message(STATUS "|- swiften : -DSWIFTEN_INCLUDE_DIR,  -DSWIFTEN_LIBRARY")
 message(STATUS "  |- zlib  :                         -DZLIB_LIBRARY")
 message(STATUS "  |- expat :                         -DEXPAT_LIBRARY")
 message(STATUS "  |-libidn :                         -DLIBIDN_LIBRARY")
 message(STATUS "  |-libxml :                         -DLIBXML_LIBRARY")
 message(STATUS "|- boost   : -DBOOST_INCLUDEDIR,     -DBOOST_LIBRARYDIR")
 message(STATUS "|- protobuf: -DPROTOBUF_INCLUDE_DIR, -DPROTOBUF_LIBRARY")
 message(STATUS "           : -DPROTOBUF_PROTOC_EXECUTABLE")
 message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR,  -DLOG4CXX_LIBRARY")
 message(STATUS "|- purple  : -DPURPLE_INCLUDE_DIR,   -DPURPLE_LIBRARY")
 message(STATUS "           : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
 message(STATUS "|- glib2   : -DGLIB2_INCLUDE_DIR,    -DGLIB2_LIBRARIES")
 if(NOT LIB_INSTALL_DIR)
 	set(LIB_INSTALL_DIR "lib")
 endif()
 set(CMAKE_MODULE_PATH "cmake_modules")
 # FIND CPPUNIT
 if(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
 	set(CCPUNIT_LIBRARIES ${CPPUNIT_LIBRARY})
 	message(STATUS "Using cppunit: ${CPPUNIT_INCLUDE_DIR} ${CPPUNIT_LIBRARIES}")
 else()
 	set(cppunit_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(cppunit)
 endif()
 # FIND SQLITE3
 if (NOT CMAKE_COMPILER_IS_GNUCXX)
 ADD_SUBDIRECTORY(msvc-deps)
 else()
 if (WIN32)
 ADD_SUBDIRECTORY(msvc-deps/sqlite3)
 else()
 set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
@@ @@ -49,54 +48,54 @@ find_package(mysql) @@
 # FIND LIBPURPLE
 if( PURPLE_INCLUDE_DIR )
 	if (PURPLE_NOT_RUNTIME)
 		set(PURPLE_LIBRARY "")
 	endif(PURPLE_NOT_RUNTIME)
 	set(PURPLE_FOUND 1)
 	message(STATUS "Using purple: ${PURPLE_INCLUDE_DIR} ${PURPLE_LIBRARY}")
 else()
 	set(purple_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(purple)
 endif()
 if (WIN32)
 	if (PURPLE_NOT_RUNTIME)
 		add_definitions(-DPURPLE_RUNTIME=0)
 	else(PURPLE_NOT_RUNTIME)
 		add_definitions(-DPURPLE_RUNTIME=1)
 	endif(PURPLE_NOT_RUNTIME)
 else()
 	add_definitions(-DPURPLE_RUNTIME=0)
 endif()
 # FIND GLIB
 if (GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
 	set(GLIB2_FOUND TRUE)
 else()
 # if (GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
 # 	set(GLIB2_FOUND TRUE)
 # else()
 	set(glib_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(glib)
 endif()
+# endif()
 # FIND LIBXML2
 # set(libxml2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 # find_package(libxml2)
 # FIND POPT
 if (NOT WIN32)
 	set(popt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(popt)
 endif()
 # FIND LIBEVENT
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)
 # FIND SWIFTEN
 if(WIN32 AND SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 	if (ZLIB_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${ZLIB_LIBRARY})
 	endif()
 	if (EXPAT_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${EXPAT_LIBRARY})
 	endif()
 	if (LIBIDN_LIBRARY)

0 comments (0 inline, 0 general)