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

Replace obsolescent LINK_(PRIVATE|PUBLIC) with (PRIVATE|PUBLIC) #629

Merged
merged 1 commit into from
Jun 24, 2021
Merged

Replace obsolescent LINK_(PRIVATE|PUBLIC) with (PRIVATE|PUBLIC) #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ endif()

avogadro_add_library(AvogadroCore ${HEADERS} ${SOURCES})
target_link_libraries(AvogadroCore
LINK_PRIVATE ${SPGLIB_LIBRARY} ${EXTRA_LINK_LIB})
PRIVATE ${SPGLIB_LIBRARY} ${EXTRA_LINK_LIB})
8 changes: 4 additions & 4 deletions avogadro/io/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ endif()
avogadro_add_library(AvogadroIO ${HEADERS} ${SOURCES})

target_link_libraries(AvogadroIO
LINK_PUBLIC AvogadroCore
LINK_PRIVATE struct)
PUBLIC AvogadroCore
PRIVATE struct)
if(USE_HDF5)
target_link_libraries(AvogadroIO LINK_PRIVATE ${HDF5_LIBRARIES})
target_link_libraries(AvogadroIO PRIVATE ${HDF5_LIBRARIES})
endif()
if(WIN32)
target_link_libraries(AvogadroIO LINK_PRIVATE ws2_32)
target_link_libraries(AvogadroIO PRIVATE ws2_32)
endif()
6 changes: 3 additions & 3 deletions avogadro/qtplugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function(avogadro_plugin name description type header pluginClass sources)
${rc_srcs}
${name}Plugin.cpp
)
target_link_libraries(${name} LINK_PRIVATE AvogadroCore AvogadroQtGui)
target_link_libraries(${name} PRIVATE AvogadroCore AvogadroQtGui)

if("${_plugin_object}" STREQUAL "STATIC")
set_target_properties(${name} PROPERTIES COMPILE_DEFINITIONS
Expand Down Expand Up @@ -219,5 +219,5 @@ set(SOURCES
)

avogadro_add_library(AvogadroQtPlugins ${HEADERS} ${SOURCES})
target_link_libraries(AvogadroQtPlugins LINK_PUBLIC ${Qt5Core_LIBRARIES}
LINK_PRIVATE ${AvogadroLibs_STATIC_PLUGINS} AvogadroQtGui)
target_link_libraries(AvogadroQtPlugins PUBLIC ${Qt5Core_LIBRARIES}
PRIVATE ${AvogadroLibs_STATIC_PLUGINS} AvogadroQtGui)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/apbs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ avogadro_plugin(apbs
)

target_link_libraries(apbs
LINK_PRIVATE AvogadroIO AvogadroMoleQueue)
PRIVATE AvogadroIO AvogadroMoleQueue)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/ballandstick/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ avogadro_plugin(BallStick
ballandstick.cpp
"")

target_link_libraries(BallStick LINK_PRIVATE AvogadroRendering)
target_link_libraries(BallStick PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/bondcentrictool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ avogadro_plugin(BondCentric
"${bondcentrictool_rcs}"
)

target_link_libraries(BondCentric LINK_PRIVATE AvogadroQtOpenGL)
target_link_libraries(BondCentric PRIVATE AvogadroQtOpenGL)
4 changes: 2 additions & 2 deletions avogadro/qtplugins/clientserver/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ add_executable(avogadroserver
)

target_link_libraries(avogadroserver
LINK_PRIVATE vtkParallelCore AvogadroProtoCall)
PRIVATE vtkParallelCore AvogadroProtoCall)

install(TARGETS avogadroserver
RUNTIME DESTINATION ${INSTALL_RUNTIME_DIR}
Expand Down Expand Up @@ -72,4 +72,4 @@ avogadro_plugin(ClientServer
)

target_link_libraries(ClientServer
LINK_PRIVATE AvogadroIO vtkParallelCore AvogadroProtoCall)
PRIVATE AvogadroIO vtkParallelCore AvogadroProtoCall)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/coloropacitymap/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ avogadro_plugin(ColorOpacityMap
)

target_link_libraries(ColorOpacityMap
LINK_PRIVATE
PRIVATE
AvogadroQtOpenGL
AvogadroVtk)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/commandscripts/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ avogadro_plugin(commands
"${command_srcs}"
)

target_link_libraries(commands LINK_PRIVATE AvogadroIO)
target_link_libraries(commands PRIVATE AvogadroIO)

# Bundled command scripts
set(commands
Expand Down
2 changes: 1 addition & 1 deletion avogadro/qtplugins/copypaste/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ avogadro_plugin(CopyPaste
""
)

target_link_libraries(CopyPaste LINK_PRIVATE AvogadroIO)
target_link_libraries(CopyPaste PRIVATE AvogadroIO)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/cp2kinput/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ avogadro_plugin(Cp2kInput
cp2kinputdialog.ui
)

target_link_libraries(Cp2kInput LINK_PRIVATE AvogadroMoleQueue)
target_link_libraries(Cp2kInput PRIVATE AvogadroMoleQueue)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/crystal/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ avogadro_plugin(CrystalScene
CrystalScene
crystalscene.cpp)

target_link_libraries(CrystalScene LINK_PRIVATE AvogadroRendering)
target_link_libraries(CrystalScene PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/editor/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ avogadro_plugin(Editor
"${editor_rcs}"
)

target_link_libraries(Editor LINK_PRIVATE AvogadroRendering)
target_link_libraries(Editor PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/fetchpdb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ avogadro_plugin(FetchPDB
)

target_link_libraries(FetchPDB
LINK_PRIVATE AvogadroIO ${Qt5Network_LIBRARIES})
PRIVATE AvogadroIO ${Qt5Network_LIBRARIES})
2 changes: 1 addition & 1 deletion avogadro/qtplugins/force/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ avogadro_plugin(Force
force.cpp
"")

target_link_libraries(Force LINK_PRIVATE AvogadroRendering)
target_link_libraries(Force PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/gamessinput/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ avogadro_plugin(GamessInput
gamessinputdialog.ui
)

target_link_libraries(GamessInput LINK_PRIVATE AvogadroMoleQueue)
target_link_libraries(GamessInput PRIVATE AvogadroMoleQueue)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/importpqr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ avogadro_plugin(ImportPQR
""
)

target_link_libraries(ImportPQR LINK_PRIVATE ${Qt5Network_LIBRARIES})
target_link_libraries(ImportPQR PRIVATE ${Qt5Network_LIBRARIES})
2 changes: 1 addition & 1 deletion avogadro/qtplugins/licorice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ avogadro_plugin(Licorice
licorice.cpp
"")

target_link_libraries(Licorice LINK_PRIVATE AvogadroRendering)
target_link_libraries(Licorice PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/manipulator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ avogadro_plugin(Manipulator
"${manipulator_rcs}"
)

target_link_libraries(Manipulator LINK_PRIVATE AvogadroQtOpenGL)
target_link_libraries(Manipulator PRIVATE AvogadroQtOpenGL)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/measuretool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ avogadro_plugin(MeasureTool
"${measuretool_rcs}"
)

target_link_libraries(MeasureTool LINK_PRIVATE AvogadroQtOpenGL)
target_link_libraries(MeasureTool PRIVATE AvogadroQtOpenGL)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/meshes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ avogadro_plugin(Meshes
meshes.cpp
"")

target_link_libraries(Meshes LINK_PRIVATE AvogadroRendering)
target_link_libraries(Meshes PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/mongochem/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ avogadro_plugin(MongoChem
"${uis}"
)

target_link_libraries(MongoChem LINK_PRIVATE ${Qt5Network_LIBRARIES})
target_link_libraries(MongoChem PRIVATE ${Qt5Network_LIBRARIES})
2 changes: 1 addition & 1 deletion avogadro/qtplugins/navigator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ avogadro_plugin(Navigator
"${navigator_rcs}"
)

target_link_libraries(Navigator LINK_PRIVATE AvogadroQtOpenGL)
target_link_libraries(Navigator PRIVATE AvogadroQtOpenGL)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/networkdatabases/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ avogadro_plugin(NetworkDatabases
)

target_link_libraries(NetworkDatabases
LINK_PRIVATE AvogadroIO ${Qt5Network_LIBRARIES})
PRIVATE AvogadroIO ${Qt5Network_LIBRARIES})
2 changes: 1 addition & 1 deletion avogadro/qtplugins/openbabel/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ avogadro_plugin(OpenBabel
"${openbabel_uis}"
)

target_link_libraries(OpenBabel LINK_PRIVATE AvogadroIO)
target_link_libraries(OpenBabel PRIVATE AvogadroIO)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/overlayaxes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ avogadro_plugin(OverlayAxes
overlayaxes.cpp
"")

target_link_libraries(OverlayAxes LINK_PRIVATE AvogadroRendering)
target_link_libraries(OverlayAxes PRIVATE AvogadroRendering)
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 gwavi)
target_link_libraries(PlayerTool PRIVATE gwavi)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/plotpdf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ avogadro_plugin(PlotPdf
"${plotpdf_uis}"
)

target_link_libraries(PlotPdf LINK_PRIVATE AvogadroVtk)
target_link_libraries(PlotPdf PRIVATE AvogadroVtk)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/plotrmsd/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(PlotRmsd
""
)

target_link_libraries(PlotRmsd LINK_PRIVATE AvogadroVtk)
target_link_libraries(PlotRmsd PRIVATE AvogadroVtk)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/plotxrd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ avogadro_plugin(PlotXrd
"${plotxrd_uis}"
)

target_link_libraries(PlotXrd LINK_PRIVATE AvogadroVtk)
target_link_libraries(PlotXrd PRIVATE AvogadroVtk)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/plugindownloader/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ avogadro_plugin(PluginDownloader
""
)

target_link_libraries(PluginDownloader LINK_PRIVATE ${Qt5Network_LIBRARIES}
target_link_libraries(PluginDownloader PRIVATE ${Qt5Network_LIBRARIES}
${LIBARCHIVE_LIBRARIES})
2 changes: 1 addition & 1 deletion avogadro/qtplugins/povray/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ avogadro_plugin(POVRay
""
)

target_link_libraries(POVRay LINK_PRIVATE AvogadroRendering)
target_link_libraries(POVRay PRIVATE AvogadroRendering)
4 changes: 2 additions & 2 deletions avogadro/qtplugins/qtaim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ avogadro_plugin(QTAIMExtension
)

target_link_libraries(QTAIMExtension
LINK_PRIVATE
PRIVATE
Qt5::Concurrent)

# The settings widget is not built -- its settings weren't actually used by the
Expand All @@ -33,5 +33,5 @@ avogadro_plugin(QTAIMScenePlugin
)

target_link_libraries(QTAIMScenePlugin
LINK_PRIVATE
PRIVATE
AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/quantuminput/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ avogadro_plugin(QuantumInput
"${quantuminput_srcs}"
)

target_link_libraries(QuantumInput LINK_PRIVATE AvogadroIO AvogadroMoleQueue)
target_link_libraries(QuantumInput PRIVATE AvogadroIO AvogadroMoleQueue)

set(_prefix "${AvogadroLibs_SOURCE_DIR}/../avogadrogenerators")
# Look in parallel directory for the avogadrogenerators repository.
Expand Down
2 changes: 1 addition & 1 deletion avogadro/qtplugins/resetview/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ avogadro_plugin(ResetView
""
)

target_link_libraries(ResetView LINK_PRIVATE AvogadroRendering)
target_link_libraries(ResetView PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/scriptfileformats/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ avogadro_plugin(ScriptFileFormats
""
)

target_link_libraries(ScriptFileFormats LINK_PRIVATE AvogadroQuantumIO)
target_link_libraries(ScriptFileFormats PRIVATE AvogadroQuantumIO)

# Bundled format scripts:
set(format_scripts
Expand Down
2 changes: 1 addition & 1 deletion avogadro/qtplugins/selectiontool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ avogadro_plugin(Selection
"${tool_rcs}"
)

target_link_libraries(Selection LINK_PRIVATE AvogadroQtOpenGL)
target_link_libraries(Selection PRIVATE AvogadroQtOpenGL)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/surfaces/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ avogadro_plugin(Surfaces
)

target_link_libraries(Surfaces
LINK_PRIVATE
PRIVATE
AvogadroQuantumIO
AvogadroQtOpenGL
Qt5::Concurrent
Expand Down
2 changes: 1 addition & 1 deletion avogadro/qtplugins/svg/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(SVG
""
)

target_link_libraries(SVG LINK_PRIVATE AvogadroRendering Qt5::Svg)
target_link_libraries(SVG PRIVATE AvogadroRendering Qt5::Svg)
4 changes: 2 additions & 2 deletions avogadro/qtplugins/symmetry/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ avogadro_plugin(SymmetryScene
SymmetryScene
symmetryscene.cpp)

target_link_libraries(Symmetry LINK_PRIVATE ${LIBMSYM_LIBRARIES})
target_link_libraries(SymmetryScene LINK_PRIVATE AvogadroRendering)
target_link_libraries(Symmetry PRIVATE ${LIBMSYM_LIBRARIES})
target_link_libraries(SymmetryScene PRIVATE AvogadroRendering)

2 changes: 1 addition & 1 deletion avogadro/qtplugins/vanderwaals/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ avogadro_plugin(VanDerWaals
vanderwaals.cpp
"")

target_link_libraries(VanDerWaals LINK_PRIVATE AvogadroRendering)
target_link_libraries(VanDerWaals PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/vanderwaalsao/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ avogadro_plugin(VanDerWaalsAO
vanderwaalsao.cpp
"")

target_link_libraries(VanDerWaalsAO LINK_PRIVATE AvogadroRendering)
target_link_libraries(VanDerWaalsAO PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/vrml/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ avogadro_plugin(VRML
""
)

target_link_libraries(VRML LINK_PRIVATE AvogadroRendering)
target_link_libraries(VRML PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/wireframe/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ avogadro_plugin(Wireframe
wireframe.cpp
"")

target_link_libraries(Wireframe LINK_PRIVATE AvogadroRendering)
target_link_libraries(Wireframe PRIVATE AvogadroRendering)
2 changes: 1 addition & 1 deletion avogadro/qtplugins/yaehmop/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ avogadro_plugin(Yaehmop
"${yaehmop_uis}"
)

target_link_libraries(Yaehmop LINK_PRIVATE AvogadroVtk)
target_link_libraries(Yaehmop PRIVATE AvogadroVtk)
2 changes: 1 addition & 1 deletion avogadro/quantumio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ set(SOURCES
)

avogadro_add_library(AvogadroQuantumIO ${HEADERS} ${SOURCES})
target_link_libraries(AvogadroQuantumIO LINK_PUBLIC AvogadroIO)
target_link_libraries(AvogadroQuantumIO PUBLIC AvogadroIO)