From 693c5358441052228c508d0f1fd15bffa0363ae7 Mon Sep 17 00:00:00 2001 From: Tim Coalson Date: Mon, 9 Mar 2015 15:30:16 -0500 Subject: [PATCH] remove unneeded cmake variable, fix libxml++ finding script to work correctly with pkg-config --- CMakeLists.txt | 1 - cmake/Modules/Findlibxml++.cmake | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7869ee3..0775ad0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,6 @@ IF (NOT QT_FOUND) FIND_PACKAGE(libxml++ REQUIRED) INCLUDE_DIRECTORIES(${libxml++_INCLUDE_DIRS}) SET(LIBS ${LIBS} ${libxml++_LIBRARIES}) - SET(CIFTILIB_USE_XMLPP TRUE) ADD_DEFINITIONS(-DCIFTILIB_USE_XMLPP) ENDIF (NOT QT_FOUND) diff --git a/cmake/Modules/Findlibxml++.cmake b/cmake/Modules/Findlibxml++.cmake index 8426c2f..4420a21 100644 --- a/cmake/Modules/Findlibxml++.cmake +++ b/cmake/Modules/Findlibxml++.cmake @@ -11,7 +11,7 @@ IF(GLIBMM_FOUND AND LIBXML2_FOUND) #use pkg-config FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(PC_LIBXMLPP QUIET libxml++ libxml++-2.6) + PKG_CHECK_MODULES(PC_LIBXMLPP QUIET libxml++-2.6) FIND_PATH(libxml++_INCLUDE_DIR NAMES libxml++/libxml++.h HINTS ${PC_LIBXMLPP_INCLUDEDIR} ${PC_LIBXMLPP_INCLUDE_DIRS}) FIND_PATH(libxml++config_INCLUDE_DIR NAMES libxml++config.h HINTS ${PC_LIBXMLPP_INCLUDEDIR} ${PC_LIBXMLPP_INCLUDE_DIRS})