remove unneeded cmake variable, fix libxml++ finding script to work c…

…orrectly with pkg-config
Washington-University · Mar 9, 2015 · 693c535 · 693c535
1 parent f6e68a8
commit 693c535
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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})