Skip to content
Snippets Groups Projects
Commit a190f468 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Remove explicit target_link_libs link interface.

parent 85258816
No related branches found
No related tags found
No related merge requests found
Showing
with 24 additions and 25 deletions
......@@ -4,8 +4,7 @@ set(LIB_SOURCES ProjectData.cpp)
# Library
add_library(ApplicationsLib ${LIB_SOURCES})
target_link_libraries(ApplicationsLib INTERFACE
GeoLib
target_link_libraries(ApplicationsLib
MeshGeoToolsLib
NumLib
ProcessLib
......
......@@ -130,8 +130,8 @@ add_library(QtDataView
${UIS}
)
target_link_libraries(QtDataView PUBLIC Qt4::QtCore Qt4::QtGui)
target_link_libraries(QtDataView INTERFACE
target_link_libraries(QtDataView Qt4::QtCore Qt4::QtGui)
target_link_libraries(QtDataView
FileIO
DataHolderLib
QtBase
......@@ -141,7 +141,7 @@ add_dependencies(QtDataView QtDiagramView QtStratView)
ADD_VTK_DEPENDENCY(QtDataView)
if(GEOTIFF_FOUND)
target_link_libraries( QtDataView INTERFACE ${GEOTIFF_LIBRARIES} )
target_link_libraries( QtDataView ${GEOTIFF_LIBRARIES} )
endif () # GEOTIFF_FOUND
set_property(TARGET QtDataView PROPERTY FOLDER "DataExplorer")
......@@ -39,6 +39,6 @@ add_library(QtDiagramView
${UIS}
)
target_link_libraries(QtDiagramView PUBLIC Qt4::QtGui)
target_link_libraries(QtDiagramView Qt4::QtGui)
set_property(TARGET QtDiagramView PROPERTY FOLDER "DataExplorer")
......@@ -30,6 +30,6 @@ add_library(QtStratView
${UIS}
)
target_link_libraries(QtStratView PUBLIC Qt4::QtGui)
target_link_libraries(QtStratView Qt4::QtGui)
set_property(TARGET QtStratView PROPERTY FOLDER "DataExplorer")
......@@ -25,7 +25,7 @@ add_library( VtkAct
ADD_VTK_DEPENDENCY(VtkAct)
target_link_libraries( VtkAct PUBLIC Qt4::QtCore )
target_link_libraries( VtkAct INTERFACE ${VTK_LIBRARIES} )
target_link_libraries( VtkAct Qt4::QtCore )
target_link_libraries( VtkAct ${VTK_LIBRARIES} )
set_property(TARGET VtkAct PROPERTY FOLDER "DataExplorer")
......@@ -123,11 +123,11 @@ ADD_VTK_DEPENDENCY(VtkVis)
if(GEOTIFF_FOUND)
include_directories(${GEOTIFF_INCLUDE_DIRS})
target_link_libraries(VtkVis INTERFACE ${GEOTIFF_LIBRARIES})
target_link_libraries(VtkVis ${GEOTIFF_LIBRARIES})
endif() # GEOTIFF_FOUND
target_link_libraries(VtkVis PUBLIC Qt4::QtGui QtDataView)
target_link_libraries(VtkVis INTERFACE VtkAct)
target_link_libraries(VtkVis Qt4::QtGui QtDataView)
target_link_libraries(VtkVis VtkAct)
if(VTKOSGCONVERTER_FOUND)
USE_OPENSG(VtkVis)
......
......@@ -7,7 +7,7 @@ set(SOURCES ${SOURCES_ASSEMBLERLIB})
# Create the library
add_library(AssemblerLib ${SOURCES})
target_link_libraries(AssemblerLib INTERFACE
target_link_libraries(AssemblerLib
MeshLib
)
......
......@@ -7,12 +7,12 @@ add_library(BaseLib ${SOURCES})
set_target_properties(BaseLib PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(BaseLib INTERFACE
target_link_libraries(BaseLib
logog
)
if(MSVC)
target_link_libraries(BaseLib INTERFACE WinMM) # needed for timeGetTime
target_link_libraries(BaseLib WinMM) # needed for timeGetTime
endif()
if(TARGET Eigen)
......
......@@ -55,24 +55,24 @@ include(${PROJECT_SOURCE_DIR}/scripts/cmake/OGSEnabledElements.cmake)
# Create the library
add_library(FileIO ${SOURCES})
target_link_libraries(FileIO INTERFACE
target_link_libraries(FileIO
GeoLib
InSituLib
MeshLib
logog
)
if(QT4_FOUND)
target_link_libraries(FileIO PUBLIC Qt4::QtXml Qt4::QtXmlPatterns)
target_link_libraries(FileIO Qt4::QtXml Qt4::QtXmlPatterns)
if(WIN32 AND CMAKE_CROSSCOMPILING)
find_package(OpenSSL)
if(OPENSSL_FOUND)
target_link_libraries(FileIO PUBLIC Qt4::QtNetwork ${OPENSSL_LIBRARIES} ws2_32)
target_link_libraries(FileIO Qt4::QtNetwork ${OPENSSL_LIBRARIES} ws2_32)
endif()
endif()
endif()
if(Shapelib_FOUND)
target_link_libraries(FileIO INTERFACE ${Shapelib_LIBRARIES})
target_link_libraries(FileIO ${Shapelib_LIBRARIES})
endif()
ADD_VTK_DEPENDENCY(FileIO)
......
......@@ -6,7 +6,7 @@ add_library(GeoLib ${SOURCES_GeoLib}
${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/tetgen/predicates.cxx
)
target_link_libraries(GeoLib INTERFACE
target_link_libraries(GeoLib
BaseLib
MathLib
logog
......
......@@ -9,7 +9,7 @@ add_library(InSituLib
VtkMeshNodalCoordinatesTemplate-impl.h
)
target_link_libraries(InSituLib INTERFACE MeshLib ${VTK_LIBRARIES})
target_link_libraries(InSituLib MeshLib ${VTK_LIBRARIES})
ADD_VTK_DEPENDENCY(InSituLib)
......
......@@ -4,7 +4,7 @@ GET_SOURCE_FILES(SOURCES_MeshGeoToolsLib)
# Create the library
add_library(MeshGeoToolsLib ${SOURCES_MeshGeoToolsLib})
target_link_libraries(MeshGeoToolsLib INTERFACE
target_link_libraries(MeshGeoToolsLib
BaseLib
MathLib
MeshLib
......
......@@ -17,7 +17,7 @@ set(SOURCES ${SOURCES_MESHLIB} ${SOURCES_ELEMENTS} ${SOURCES_EDITING} ${SOURCES_
# Create the library
add_library(MeshLib ${SOURCES})
target_link_libraries(MeshLib INTERFACE
target_link_libraries(MeshLib
BaseLib
GeoLib
MathLib
......
......@@ -33,7 +33,7 @@ add_library(NumLib ${SOURCES})
set_target_properties(NumLib PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(NumLib INTERFACE
target_link_libraries(NumLib
BaseLib
GeoLib
MathLib
......
......@@ -8,7 +8,7 @@ APPEND_SOURCE_FILES(SOURCES GroundwaterFlow)
add_library(ProcessLib ${SOURCES})
target_link_libraries(ProcessLib INTERFACE
target_link_libraries(ProcessLib
AssemblerLib
MeshLib
MeshGeoToolsLib
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment