From 22e561bb728aca8b110c2e9978d5372eb4d51585 2012-09-05 17:11:45 From: HanzZ Date: 2012-09-05 17:11:45 Subject: [PATCH] set PURPLE_RUNTIME before trying to detect libpurple --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 114f88771aeeb21852e3b9bb67e7bf64a5f52711..07aaf6515d598be3095df285ddedad01b535848f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,10 @@ endif() 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) @@ -59,10 +63,6 @@ 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) diff --git a/cmake_modules/purpleConfig.cmake b/cmake_modules/purpleConfig.cmake index 72ff99fd536ec05217c60c6cbf16d635b18ac8e0..cb2341ec3de24e379a82752f1dd7884d4f0e2afe 100644 --- a/cmake_modules/purpleConfig.cmake +++ b/cmake_modules/purpleConfig.cmake @@ -2,7 +2,7 @@ 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)