Skip to content

Commit

Permalink
Merge pull request #634 from bennibbelink/test-conda-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
gonuke authored Oct 25, 2024
2 parents fd3b592 + 9738613 commit f0cfd77
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Since last release
**Removed:**

* Removed references to deprecated ``ResourceBuff`` class (#604)
* Removed ``Libxml++`` from build requirements (#634)


v1.6.0
Expand Down
9 changes: 0 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,6 @@ IF(NOT CYCLUS_DOC_ONLY)
# Include macros installed with cyclus core
INCLUDE(UseCyclus)

# Find LibXML++ and dependencies
pkg_check_modules(LIBXMLXX IMPORTED_TARGET libxml++-4.0)
IF ( NOT LIBXMLXX_FOUND )
pkg_check_modules(LIBXMLXX REQUIRED IMPORTED_TARGET libxml++-2.6)
ENDIF ( NOT LIBXMLXX_FOUND )
SET(LIBS ${LIBS} PkgConfig::LIBXMLXX)
message("-- LibXML++ Include Dir: ${LIBXMLXX_INCLUDE_DIRS}")
message("-- LibXML++ Librarires: ${LIBXMLXX_LIBRARIES}")

# Include the boost header files and the program_options library
# Please be sure to use Boost rather than BOOST.
# Capitalization matters on some platforms
Expand Down

0 comments on commit f0cfd77

Please sign in to comment.