libtransport.git Changeset - f4e31926b07f

Changeset - f4e31926b07f

Parent rev.

Child rev.

[Not reviewed]

0 3 0

Jan Kaluza - 13 years ago 2012-09-05 13:01:55
hanzz.k@gmail.com

Call find_package between overriding things

3 files changed with 40 insertions and 42 deletions:

CMakeLists.txt

cmake_modules/SwiftenConfig.cmake

cmake_modules/purpleConfig.cmake

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -22,13 +22,15 @@ endif() @@
 set(CMAKE_MODULE_PATH "cmake_modules")
 # FIND CPPUNIT
 if(CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
 set(cppunit_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(cppunit)
 if(NOT CPPUNIT_FOUND AND CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
 	set(CCPUNIT_LIBRARIES ${CPPUNIT_LIBRARY})
 	set(CPPUNIT_FOUND 1)
 	message(STATUS "Using cppunit: ${CPPUNIT_INCLUDE_DIR} ${CPPUNIT_LIBRARIES}")
 else()
 	set(cppunit_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(cppunit)
 endif()
 # FIND SQLITE3
@@ @@ -48,16 +50,8 @@ set(mysql_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") @@
 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()
 set(purple_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(purple)
 if (WIN32)
 	if (PURPLE_NOT_RUNTIME)
@@ @@ -92,7 +86,11 @@ set(event_DIR "${CMAKE_SOURCE_DIR}/cmake_modules") @@
 find_package(event)
 # FIND SWIFTEN
 if(WIN32 AND SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
 set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Swiften)
 if(NOT SWIFTEN_FOUND)
 	if (ZLIB_LIBRARY)
 		set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} ${ZLIB_LIBRARY})
 	endif()
@@ @@ -111,9 +109,6 @@ if(WIN32 AND SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) @@
 	set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Iphlpapi")
 	set(SWIFTEN_LIBRARY ${SWIFTEN_LIBRARY} "Winscard")
 	message(STATUS "Using swiften: ${SWIFTEN_INCLUDE_DIR} ${SWIFTEN_LIBRARY}")
 else()
 	set(Swiften_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(Swiften)
 endif()
 if (WIN32)
@@ @@ -131,40 +126,31 @@ endif() @@
 # FIND BOOST
 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 thread signals REQUIRED)
 	else(BOOST_VERSION)
 		message(FATAL_ERROR "Set BOOST_VERSION using for example cmake . -DBOOST_VERSION=1.49.0")
 	endif(BOOST_VERSION)
 	set(Boost_USE_STATIC_LIBS      ON)
 	set(Boost_USE_MULTITHREADED      ON)
 	set(Boost_USE_STATIC_RUNTIME    OFF)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
 else(WIN32)
 	find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
 endif(WIN32)
 message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
 set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Protobuf)
 # FIND PROTOBUF
-if (WIN32 AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY)
+if (NOT PROTOBUF_FOUND AND PROTOBUF_INCLUDE_DIR AND PROTOBUF_LIBRARY)
 	set(PROTOBUF_FOUND 1)
 	set(PROTOBUF_INCLUDE_DIRS ${PROTOBUF_INCLUDE_DIR})
 	if (NOT PROTOBUF_PROTOC_EXECUTABLE)
 	if (PROTOBUF_PROTOC_EXECUTABLE)
 	else()
 		set(PROTOBUF_PROTOC_EXECUTABLE protoc)
 	endif()
 	message(STATUS "Using protobuf: ${PROTOBUF_INCLUDE_DIRS} ${PROTOBUF_LIBRARY}")
 else()
 	if (WIN32)
 		#TODO: Use bundled protobuf here...?
 		set(PROTOBUF_FOUND 1)
 		set(PROTOBUF_INCLUDE_DIRS "../include")
 		set(PROTOBUF_LIBRARY "../lib/libprotobuf.lib")
 	else(WIN32)
 		set(Protobuf_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 		find_package(Protobuf REQUIRED)
 	endif(WIN32)
 endif()
 set(Communi_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(Communi)

cmake_modules/SwiftenConfig.cmake

➞

Show inline comments

@@ @@ -23,13 +23,16 @@ if( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR ) @@
 				list(APPEND SWIFTEN_LIBRARY ${f})
 			endif()
 		endforeach(f)
 		set( SWIFTEN_FOUND 1 )
 	else()
 		message( FATAL_ERROR "Could NOT find swiften-config" )
 		message( STATUS "Could NOT find swiften-config" )
 	endif()
 	if (SWIFTEN_FOUND)
 		set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR} )
 		message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}")
 	endif()
 	set( SWIFTEN_INCLUDE_DIR ${SWIFTEN_INCLUDE_DIR} )
 	message( STATUS "Found libSwiften: ${SWIFTEN_LIBRARY}, ${SWIFTEN_INCLUDE_DIR}")
 	set( SWIFTEN_FOUND 1 )
 else( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )
-    message( FATAL_ERROR "Could NOT find libSwiften" )
+    message( STATUS "Could NOT find libSwiften" )
 endif( SWIFTEN_LIBRARY AND SWIFTEN_INCLUDE_DIR )

cmake_modules/purpleConfig.cmake

➞

Show inline comments

 FIND_LIBRARY(PURPLE_LIBRARY NAMES purple)
 FIND_PATH(PURPLE_INCLUDE_DIR NAMES "purple.h" PATH_SUFFIXES libpurple )
 if(WIN32 AND 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()
 if( PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR )
     message( STATUS "Found libpurple: ${PURPLE_LIBRARY}, ${PURPLE_INCLUDE_DIR}")
@@ @@ -8,3 +15,5 @@ if( PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR ) @@
 else( PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR )
     message( STATUS "Could NOT find libpurple" )
 endif( PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR )
 endif()

0 comments (0 inline, 0 general)