Skip to content

Commit

Permalink
MueLu: Fixes as per @cgcgcg
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Siefert <csiefer@sandia.gov>
  • Loading branch information
csiefer2 committed Dec 17, 2024
1 parent 17600fa commit e321f6f
Showing 1 changed file with 1 addition and 28 deletions.
29 changes: 1 addition & 28 deletions packages/muelu/matlab/bin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ if(TPL_ENABLE_MATLAB)
# Force the code into R2017b compatibility mode
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMX_COMPAT_64 -fPIC -DMATLAB_MEXCMD_RELEASE=R2017b")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DMX_COMPAT_64 -fPIC -DMATLAB_MEXCMD_RELEASE=R2017b")


DW
# Debugging information
MESSAGE("MEX_COMPILER = " ${MEX_COMPILER})
MESSAGE("MEX_MEXEXT = " ${MEX_MEXEXT})
Expand All @@ -28,32 +27,6 @@ if(TPL_ENABLE_MATLAB)
APPEND_SET(HEADERS_EXEC muemex.h)
APPEND_SET(SOURCES_EXEC muemex.cpp)

# First, grab the package's own libraries

#SET(LINK_LIBS)
#APPEND_SET(LINK_LIBS ${${PACKAGE_NAME}_LIBRARIES})

# Third, add test dependent package libraries
#TRIBITS_GATHER_ENABLED_ITEMS(${PACKAGE_NAME} TEST PACKAGES ALL_DEP_PACKAGES)
#TRIBITS_SORT_AND_APPEND_INCLUDE_AND_LINK_DIRS_AND_LIBS("${${PROJECT_NAME}_REVERSE_PACKAGES}"
# "${ALL_DEP_PACKAGES}" "" LINK_LIBS "")

# Fourth, add dependent test TPL libraries
#TRIBITS_GATHER_ENABLED_ITEMS(${PACKAGE_NAME} TEST TPLS ALL_TPLS)
#TRIBITS_SORT_AND_APPEND_INCLUDE_AND_LINK_DIRS_AND_LIBS("${${PROJECT_NAME}_REVERSE_TPLS}" "${ALL_TPLS}"
# TPL_ LINK_LIBS "")

# Fifth, add matlab-specific libs
#SET(LINK_LIBS ${LINK_LIBS} "mx" "mex" "mat")

# Last, add last_lib to get extra link options on the link linee
#IF (${PROJECT_NAME}_EXTRA_LINK_FLAGS)
# APPEND_SET(LINK_LIBS ${last_lib})
#ENDIF()
#IF (${PROJECT_NAME}_VERBOSE_CONFIGURE)
# PRINT_VAR(LINK_LIBS)
#ENDIF()

# Manually drop in options from the mex script (R2009b) on a linux platform.
# g++ -O -pthread -shared -Wl,--version-script,/usr/local/matlab/7.9/extern/lib/glnxa64/mexFunction.map -Wl,--no-undefined -o "mlmex.mexa64" "mlmex-mlmex.o" -lm -Wl,-rpath-link,/usr/local/matlab/7.9/bin/glnxa64 -L/usr/local/matlab/7.9/bin/glnxa64 -lmx -lmex -lmat -lm
if (NOT APPLE)
Expand Down

0 comments on commit e321f6f

Please sign in to comment.