Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #8524 - CPack packages missing the vast majority of files #8525

Merged
merged 2 commits into from
Feb 11, 2021
Merged

Fix #8524 - CPack packages missing the vast majority of files #8525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4e2687
Fix #8524 - Found the needle in the haystack: this from PR #8275 (bri…
jmarrec Feb 10, 2021
bbb41c3
Fix #8527 - ssc shared library missing
jmarrec Feb 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cmake/Install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@ if( BUILD_FORTRAN )
list(APPEND CPACK_INSTALL_CMAKE_PROJECTS "${PROJECT_BINARY_DIR}/src/AppGPostProcess/;AppGPostProcess;ALL;/")
endif()

# Need to install the ssc lib...
install( TARGETS ssc DESTINATION ./ )

set(CPACK_PACKAGE_VENDOR "US Department of Energy" )
set(CPACK_IFW_PACKAGE_PUBLISHER "${CPACK_PACKAGE_VENDOR}")

Expand Down
9 changes: 3 additions & 6 deletions third_party/ssc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,9 @@ endfunction()
# turn off examples, tests and install for jsoncpp
set(JSONCPP_WITH_EXAMPLE 0)
set(JSONCPP_WITH_TESTS 0)
macro (install)
endmacro ()
add_subdirectory(jsoncpp)
macro (install)
_install(${ARGV})
endmacro(install)

# Skip install() commands for jsoncpp
add_subdirectory(jsoncpp EXCLUDE_FROM_ALL)
Comment on lines +143 to +145
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fix itself looks pretty simple, remove the override of the install command.

(An alternative to EXCLUDE_FROM_ALL is to modify the jsoncpp/CMakeLists.txt and comment out the install calls)


add_subdirectory(splinter)
add_subdirectory(shared)
Expand Down