libtransport.git Changeset - 22e561bb728a

Changeset - 22e561bb728a

Parent rev.

Child rev.

[Not reviewed]

0 2 0

HanzZ - 13 years ago 2012-09-05 17:11:45
hanzz.k@gmail.com

set PURPLE_RUNTIME before trying to detect libpurple

2 files changed with 5 insertions and 5 deletions:

CMakeLists.txt

cmake_modules/purpleConfig.cmake

0 comments (0 inline, 0 general)

CMakeLists.txt

➞

Show inline comments

@@ @@ -40,38 +40,38 @@ else() @@
 if (WIN32)
 ADD_SUBDIRECTORY(msvc-deps/sqlite3)
 else()
 set(sqlite3_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(sqlite3)
 endif()
 endif()
 # FIND MYSQL
 set(mysql_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(mysql)
 # FIND LIBPURPLE
 set(purple_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(purple)
 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 LIBPURPLE
 set(purple_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 find_package(purple)
 # FIND GLIB
 # if (GLIB2_INCLUDE_DIR AND GLIB2_LIBRARIES)
 # 	set(GLIB2_FOUND TRUE)
 # else()
 	set(glib_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 	find_package(glib)
 # endif()
 # FIND LIBXML2
 # set(libxml2_DIR "${CMAKE_SOURCE_DIR}/cmake_modules")
 # find_package(libxml2)

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)
+	if (NOT 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}")
     set( PURPLE_FOUND 1 )
 else( PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR )
     message( STATUS "Could NOT find libpurple" )
 endif( PURPLE_LIBRARY AND PURPLE_INCLUDE_DIR )

0 comments (0 inline, 0 general)