Skip to content

Commit

Permalink
Merge pull request #15 from LLNL/task/2016_07_install_builtin_tpls
Browse files Browse the repository at this point in the history
bugfix: reenable install of libcivet and libbb64
  • Loading branch information
cyrush committed Jul 30, 2016
2 parents 85e1e05 + 3b5808f commit cc29d5f
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/CMake/CMakeBasics.cmake
Expand Up @@ -168,7 +168,16 @@ macro(add_compiled_library)
# install and export setup
#############################
# if export is set, install our lib
if(NOT ${args_INTERNAL} OR WIN32)

#
# See https://github.com/LLNL/conduit/issues/14
# we are installing these (for now) due to an issue other cmake
# build systems importing conduit targets and still needing
# to link these type of libs, even though we are using them
# with PRIVATE cmake link properties.
#
#if(NOT ${args_INTERNAL} OR WIN32)
#

# if we have headers, install them
if(NOT "${args_HEADERS}" STREQUAL "")
Expand All @@ -192,7 +201,7 @@ macro(add_compiled_library)
ARCHIVE DESTINATION lib
RUNTIME DESTINATION lib)
endif()
endif()
#endif()

endmacro()

Expand Down

0 comments on commit cc29d5f

Please sign in to comment.