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

Add STATIC flag to circularly dependent libraries.

parent 07599339
No related branches found
No related tags found
No related merge requests found
...@@ -5,7 +5,7 @@ GET_SOURCE_FILES(SOURCES_ASSEMBLERLIB) ...@@ -5,7 +5,7 @@ GET_SOURCE_FILES(SOURCES_ASSEMBLERLIB)
set(SOURCES ${SOURCES_ASSEMBLERLIB}) set(SOURCES ${SOURCES_ASSEMBLERLIB})
# Create the library # Create the library
add_library(AssemblerLib ${SOURCES}) add_library(AssemblerLib STATIC ${SOURCES})
target_link_libraries(AssemblerLib target_link_libraries(AssemblerLib
MeshLib MeshLib
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
GET_SOURCE_FILES(SOURCES_GeoLib) GET_SOURCE_FILES(SOURCES_GeoLib)
# Create the library # Create the library
add_library(GeoLib ${SOURCES_GeoLib} add_library(GeoLib STATIC ${SOURCES_GeoLib}
${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/tetgen/predicates.cxx ${CMAKE_CURRENT_SOURCE_DIR}/../ThirdParty/tetgen/predicates.cxx
) )
......
...@@ -56,12 +56,12 @@ if(METIS_FOUND) ...@@ -56,12 +56,12 @@ if(METIS_FOUND)
endif() endif()
# Create the library # Create the library
add_library(MathLib ${SOURCES}) add_library(MathLib STATIC ${SOURCES})
set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX) set_target_properties(MathLib PROPERTIES LINKER_LANGUAGE CXX)
target_link_libraries(MathLib target_link_libraries(MathLib
logog AssemblerLib
) )
if(METIS_FOUND) if(METIS_FOUND)
......
...@@ -15,7 +15,7 @@ GET_SOURCE_FILES(SOURCES_QUALITY MeshQuality) ...@@ -15,7 +15,7 @@ GET_SOURCE_FILES(SOURCES_QUALITY MeshQuality)
set(SOURCES ${SOURCES_MESHLIB} ${SOURCES_ELEMENTS} ${SOURCES_EDITING} ${SOURCES_GENERATORS} ${SOURCES_QUALITY} ${SOURCES_SEARCH}) set(SOURCES ${SOURCES_MESHLIB} ${SOURCES_ELEMENTS} ${SOURCES_EDITING} ${SOURCES_GENERATORS} ${SOURCES_QUALITY} ${SOURCES_SEARCH})
# Create the library # Create the library
add_library(MeshLib ${SOURCES}) add_library(MeshLib STATIC ${SOURCES})
target_link_libraries(MeshLib target_link_libraries(MeshLib
BaseLib BaseLib
......
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