Commit 8c78d3ea authored by Markus Blatt's avatar Markus Blatt
Browse files

Cleanup and spelling fixes.

parent 9b0e597e
Pipeline #155 failed with stage
......@@ -81,15 +81,12 @@ endif()
macro(ug_expand_object_libs var dim)
set(${var})
foreach(_lib ${ARGN})
#message("_lib=${_lib}")
set(${var} ${${var}} "\$<TARGET_OBJECTS:${_lib}${dim}>")
endforeach()
#message("expanded ${ARGN} with var=${var} dim=${dim} to ${${var}}")
endmacro()
# a macro that creates the libraries for all dimensions.
#
macro(ug_add_dim_libs LIB_NAME)
#message("create ${LIB_NAME} ${ARGN}")
cmake_parse_arguments(ADD_LIB "OBJECT;DUNE" ""
"SOURCES;SOURCES_2D;SOURCES_3D;OBJECT_LIBS;OBJECT_DIM_LIBS;ADD_LIBS" ${ARGN})
if(ADD_LIB_APPEND)
......@@ -97,30 +94,10 @@ macro(ug_add_dim_libs LIB_NAME)
endif()
if(ADD_LIB_OBJECT)
set(OBJECT "OBJECT")
# set_property(GLOBAL PROPERTY ${LIB_NAME}_OBJECT_LIBS ${ADD_LIB_OBJECT_LIBS})
# set(ADD_LIB_OBJECT_LIBS "")
# else()
# foreach(lib ${ADD_LIB_OBJECT_LIBS})
# get_property(_saved_libs GLOBAL PROPERTY ${lib}_OBJECT_LIBS)
# set(ADD_LIB_OBJECT_LIBS ${ADD_LIB_OBJECT_LIBS} ${saved_libs})
# endforeach()
# ug_expand_object_libs(OBJECT_LIBS "" ${ADD_LIB_OBJECT_LIBS}
# ${_saved_libs})
endif()
ug_expand_object_libs(OBJECT_LIBS "" ${ADD_LIB_OBJECT_LIBS})
foreach(dim ${UG_ENABLED_DIMENSIONS})
#message("will expand ${dim} ${ADD_LIB_OBJECT_DIM_LIBS}")
# if(ADD_LIB_OBJECT)
# set_property(GLOBAL PROPERTY ${LIB_NAME}_OBJECT_DIM_LIBS
# ${ADD_LIB_OBJECT_DIM_LIBS})
# set(ADD_LIB_OBJECT_DIM_LIBS "")
# else()
# foreach(lib ${ADD_LIB_OBJECT_DIM_LIBS})
# get_property(_saved_libs GLOBAL PROPERTY ${lib}_OBJECT_DIM_LIBS)
# set(ADD_LIB_OBJECT_DIM_LIBS ${ADD_LIB_OBJECT_DIM_LIBS} ${saved_libs})
# endforeach()
# endif()
ug_expand_object_libs(OBJECT_DIM_LIBS ${dim} ${ADD_LIB_OBJECT_DIM_LIBS})
if(ADD_LIB_DUNE)
......
......@@ -11,7 +11,7 @@ set(UG_VERSION "${DUNE_UGGRID_VERSION}")
if(UG_PARALLEL STREQUAL "yes")
# Actually we probably should activate UG
# for everything. But for the being we fall
# for everything. But for the time being we fall
# back to the enable trick. To change this just
# uncomment the lines below.
#add_definitions("-DENABLE_UG=1")
......@@ -19,12 +19,9 @@ if(UG_PARALLEL STREQUAL "yes")
set(UG_DEFINITIONS "ENABLE_UG=1;ModelP")
else()
# Actually we probably should activate UG
# for everything. But for the being we fall
# for everything. But for the time being we fall
# back to the enable trick. To change this just
# uncomment the lines below.
#add_definitions("-DENABLE_UG=1")
set(UG_DEFINITIONS "ENABLE_UG=1")
endif()
message("UG_USE_SYSTEM_HEAP=${UG_USE_SYSTEM_HEAP}")
message("UG_ENABLE_SYSTEM_HEAP=${UG_ENABLE_SYSTEM_HEAP}|")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment