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

Add fedora patches #460

Merged
merged 2 commits into from
Apr 27, 2020
Merged

Add fedora patches #460

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
3665f0e
Fix lib suffix issue - #449
ghutchis Apr 27, 2020
0a58ed6
Fix gwavi naming, based on Fedora patch
ghutchis Apr 27, 2020
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
2 changes: 1 addition & 1 deletion avogadro/qtplugins/playertool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ avogadro_plugin(PlayerTool
playertool.qrc
)

target_link_libraries(PlayerTool LINK_PRIVATE libgwavi)
target_link_libraries(PlayerTool LINK_PRIVATE gwavi)
2 changes: 1 addition & 1 deletion cmake/AvogadroLibsConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ set(AvogadroLibs_VERSION "${AvogadroLibs_VERSION_MAJOR}.${AvogadroLibs_V

set(AvogadroLibs_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set(AvogadroLibs_INCLUDE_DIRS "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_INCLUDE_DIR@")
set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@@LIB_SUFFIX@")
set(AvogadroLibs_LIBRARY_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_LIBRARY_DIR@")
set(AvogadroLibs_RUNTIME_DIR "${AvogadroLibs_INSTALL_PREFIX}/@INSTALL_RUNTIME_DIR@")
set(AvogadroLibs_CMAKE_DIR "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs")

Expand Down
12 changes: 6 additions & 6 deletions thirdparty/libgwavi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
add_library(libgwavi STATIC gwavi.c fileio.c avi-utils.c)
set_target_properties(libgwavi PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
add_library(gwavi STATIC gwavi.c fileio.c avi-utils.c)
set_target_properties(gwavi PROPERTIES POSITION_INDEPENDENT_CODE TRUE)

install(TARGETS libgwavi
install(TARGETS gwavi
EXPORT "AvogadroLibsTargets"
RUNTIME DESTINATION "${INSTALL_RUNTIME_DIR}"
LIBRARY DESTINATION "${INSTALL_LIBRARY_DIR}"
ARCHIVE DESTINATION "${INSTALL_ARCHIVE_DIR}")
RUNTIME DESTINATION "${INSTALL_RUNTIME_DIR}/avogadro2"
LIBRARY DESTINATION "${INSTALL_LIBRARY_DIR}/avogadro2"
ARCHIVE DESTINATION "${INSTALL_ARCHIVE_DIR}/avogadro2")