Skip to content

Commit

Permalink
Merge 1d880d5 into 80cf137
Browse files Browse the repository at this point in the history
  • Loading branch information
cyrush committed May 6, 2021
2 parents 80cf137 + 1d880d5 commit 8ce459e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Expand Up @@ -13,7 +13,7 @@ and this project aspires to adhere to [Semantic Versioning](https://semver.org/s
- Added `conduit::utils::info_handler()`, `conduit::utils::warning_handler()`, and `conduit::utils::error_handler()` methods, which provide access to the currently registered info, warning, and error handlers.
- Added DataType::index_t method. Creates a DataType instance that describes an `index_t`, which is an alias to either `int32`, or `int 64` controlled by the `CONDUIT_INDEX_32` compile time option.
- Added several more methods to Python DataType interface

- Removed duplicate install of CMake exported target files that served as a bridge for clients using old style paths.

### Changed

Expand Down
8 changes: 0 additions & 8 deletions src/config/CMakeLists.txt
Expand Up @@ -84,12 +84,4 @@ install(FILES
conduit_setup_targets.cmake
DESTINATION ${CONDUIT_INSTALL_CMAKE_MODULE_DIR}/conduit/)

# also install to support our old export directory layout
# (preserving for now to avoid issues with downstream packages using old layout)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/ConduitConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/ConduitConfigVersion.cmake
conduit_setup_deps.cmake
conduit_setup_targets.cmake
DESTINATION ${CONDUIT_INSTALL_CMAKE_MODULE_DIR})

0 comments on commit 8ce459e

Please sign in to comment.