Skip to content

Commit

Permalink
Merge pull request #956 from sstsimulator/devel
Browse files Browse the repository at this point in the history
Automatically Merged using SST Master Branch Merger
  • Loading branch information
sst-autotester authored May 26, 2023
2 parents d31c2e6 + 3c22b62 commit 70f56eb
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 16 deletions.
2 changes: 0 additions & 2 deletions experimental/cmake_configure_files/sstsimulator.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ PYTHON_CONFIG=${Python_CONFIG}
PYTHON_CPPFLAGS=-I${Python_INCLUDE_DIRS}
PYTHON_LDFLAGS=${Python_LIBRARIES}
PYTHON_VERSION3=yes
ZOLTAN_CPPFLAGS=
ZOLTAN_LDFLAGS=
LIBZ_CPPFLAGS=${ZLIB_INCLUDE_DIRS}
LIBZ_LDFLAGS=${ZLIB_LIBRARIES}
LIBZ_LIBS=-lz
Expand Down
9 changes: 0 additions & 9 deletions src/sst/core/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ CXX = $(MPICXX)
AM_CPPFLAGS = \
-DTIXML_USE_STL \
-DSST_BUILDING_CORE=1 \
$(ZOLTAN_CPPFLAGS) \
$(PYTHON_CPPFLAGS) \
-I$(top_srcdir)/external \
$(LTDLINCL)
Expand Down Expand Up @@ -292,30 +291,22 @@ sstinfo_x_SOURCES = \

sstsim_x_LDADD = \
$(PYTHON_LIBS) \
$(ZOLTAN_LIB) \
$(PARMETIS_LIB) \
$(MPILIBS) \
$(TCMALLOC_LIB) \
-lm

sstsim_x_LDFLAGS = \
$(PARMETIS_LDFLAGS) \
$(ZOLTAN_LDFLAGS) \
$(TCMALLOC_LDFLAGS) \
$(PYTHON_LDFLAGS) \
-export-dynamic \
$(SST_LTLIBS_ELEMLIBS)

sstinfo_x_LDADD = \
$(ZOLTAN_LIB) \
$(PARMETIS_LIB) \
$(MPILIBS) \
$(TCMALLOC_LIB) \
-lm

sstinfo_x_LDFLAGS = \
$(PARMETIS_LDFLAGS) \
$(ZOLTAN_LDFLAGS) \
$(TCMALLOC_LDFLAGS) \
$(PYTHON_LDFLAGS) \
-export-dynamic \
Expand Down
3 changes: 0 additions & 3 deletions src/sst/core/impl/partitioners/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,4 @@ add_library(partitioner OBJECT linpart.cc rrobin.cc selfpart.cc simplepart.cc
target_include_directories(partitioner PUBLIC ${SST_TOP_SRC_DIR}/src/)
target_link_libraries(partitioner PUBLIC sst-config-headers)

# Not supporting ZOLTAN with CMake if(ZOLTAN_FOUND)
# target_sources(libpartitioner zoltpart.cc) endif(ZOLTAN_FOUND)

# EOF
2 changes: 0 additions & 2 deletions src/sst/sst.conf
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ PYTHON_CONFIG=@PYTHON_CONFIG_EXE@
PYTHON_CPPFLAGS=@PYTHON_CPPFLAGS@
PYTHON_LDFLAGS=@PYTHON_LDFLAGS@
PYTHON_VERSION3=@PYTHON_VERSION3@
ZOLTAN_CPPFLAGS=@ZOLTAN_CPPFLAGS@
ZOLTAN_LDFLAGS=@ZOLTAN_LDFLAGS@
LIBZ_CPPFLAGS=@LIBZ_CPPFLAGS@
LIBZ_LDFLAGS=@LIBZ_LDFLAGS@
LIBZ_LIBS=@LIBZ_LIBS@
Expand Down

0 comments on commit 70f56eb

Please sign in to comment.