libtransport.git Changeset - a0c8e83be6e3

Changeset - a0c8e83be6e3

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 13 years ago 2012-09-01 07:57:04
hanzz.k@gmail.com

Windows compilation tweaks

2 files changed with 21 insertions and 3 deletions:

CMakeLists.txt

cmake_modules/SwiftenConfig.cmake

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -24,64 +24,82 @@ endif() @@
 set(mysql_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(mysql)
 set(purple_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(purple)
 set(glib_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(glib)
 set(libxml2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(libxml2)
 if (NOT WIN32)
 	set(popt_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(popt)
 endif()
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)
 set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Swiften)
 if (WIN32)
 add_definitions(-DSWIFTEN_STATIC=1)
 endif()
 if (CMAKE_COMPILER_IS_GNUCXX)
 set(openssl_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(openssl)
 endif()
 set(Boost_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 if (WIN32)
 if (BOOST_VERSION)
 	set(Boost_USE_STATIC_LIBS      ON)
 	set(Boost_USE_MULTITHREADED      ON)
 	set(Boost_USE_STATIC_RUNTIME    OFF)
 	find_package(Boost ${BOOST_VERSION} COMPONENTS program_options date_time system filesystem regex  signals REQUIRED)
 else()
 	message(FATAL_ERROR "Set BOOST_VERSION using for example cmake . -DBOOST_VERSION=1.49.0")
 endif()
 else()
 find_package(Boost COMPONENTS program_options date_time system filesystem regex  signals REQUIRED)
 endif()
 message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 if (WIN32)
 #TODO: Use bundled protobuf here...?
 set(PROTOBUF_FOUND 1)
 set(PROTOBUF_INCLUDE_DIRS "../include")
 set(PROTOBUF_LIBRARY "../lib/libprotobuf.lib")
 else()
 set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Protobuf REQUIRED)
 endif()
 set(Communi_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Communi)
 set(log4cxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(log4cxx)
 set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(event)
 set(pqxx_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(pqxx)
 if (NOT WIN32)
 set(dbus_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(dbus)
 endif()
 set(yahoo2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(yahoo2)
 find_package(Doxygen)
 INCLUDE(FindQt4)

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

 FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften)
 FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften/Swiften.h" PATH_SUFFIXES libSwiften Swiften )
 FIND_LIBRARY(SWIFTEN_LIBRARY NAMES Swiften HINTS ../lib)
 FIND_PATH(SWIFTEN_INCLUDE_DIR NAMES "Swiften/Swiften.h" PATH_SUFFIXES libSwiften Swiften HINTS ../include)
 if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable")
+	find_program(SWIFTEN_CONFIG_EXECUTABLE NAMES swiften-config DOC "swiften-config executable" HINTS ../bin)
 	set( SWIFTEN_CFLAGS "" )
 	if (SWIFTEN_CONFIG_EXECUTABLE)
 		execute_process(
 			COMMAND ${SWIFTEN_CONFIG_EXECUTABLE} --libs
 			OUTPUT_VARIABLE SWIFTEN_LIB)
 		string(REGEX REPLACE "[\r\n]"                  " " SWIFTEN_LIB ${SWIFTEN_LIB})
 		string(REGEX REPLACE " +$"                     ""  SWIFTEN_LIB ${SWIFTEN_LIB})
 		string(REGEX REPLACE " " ";" SWIFTEN_LIB ${SWIFTEN_LIB})
 		set(SWIFTEN_LIBRARY "")
 		foreach(f ${SWIFTEN_LIB})
 			STRING(SUBSTRING ${f} 0 2 f_out)
 			STRING(COMPARE EQUAL ${f_out} "/L" IS_PATH)
 			if(${IS_PATH})
 				string(REGEX REPLACE "/LIBPATH:" ""  f_replaced "${f}")
 				message("Added link directory: ${f_replaced}")
 				link_directories(${f_replaced})
 			else()
 				list(APPEND SWIFTEN_LIBRARY ${f})
 			endif()
 		endforeach(f)
 	else()
 		message( FATAL_ERROR "Could NOT find swiften-config" )
 	endif()

0 comments (0 inline, 0 general)