Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GraphBLAS: Check for ability to link with libdl. #838

Merged
merged 2 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions GraphBLAS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -409,13 +409,13 @@ if ( NOT NO_LIBM )
endif ( )

# libdl
if ( NOT WIN32 )
if ( NOT "${CMAKE_DL_LIBS}" STREQUAL "" )
if ( BUILD_SHARED_LIBS )
target_link_libraries ( GraphBLAS PRIVATE dl )
target_link_libraries ( GraphBLAS PRIVATE ${CMAKE_DL_LIBS} )
endif ( )
if ( BUILD_STATIC_LIBS )
list ( APPEND GRAPHBLAS_STATIC_LIBS "dl" )
target_link_libraries ( GraphBLAS_static PUBLIC dl )
list ( APPEND GRAPHBLAS_STATIC_LIBS ${CMAKE_DL_LIBS} )
target_link_libraries ( GraphBLAS_static PUBLIC ${CMAKE_DL_LIBS} )
endif ( )
endif ( )

Expand Down
8 changes: 4 additions & 4 deletions Mongoose/Include/Mongoose_Logger.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ typedef enum TimingType
class Logger
{
private:
/* MONGOOSE_API */ static int debugLevel;
/* MONGOOSE_API */ static bool timingOn;
/* MONGOOSE_API */ static double clocks[6];
/* MONGOOSE_API */ static float times[6];
MONGOOSE_API static int debugLevel;
MONGOOSE_API static bool timingOn;
MONGOOSE_API static double clocks[6];
MONGOOSE_API static float times[6];

public:
static inline void tic(TimingType timingType);
Expand Down
Loading