Skip to content

Commit

Permalink
Merge pull request #24 from traversaro/addwinsupport
Browse files Browse the repository at this point in the history
Fix compilation on Windows
  • Loading branch information
felixlen committed Sep 30, 2023
2 parents 407144f + 147fd5a commit 89cc5cf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
13 changes: 11 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ target_include_directories(trlib
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
$<INSTALL_INTERFACE:include>)

target_link_libraries(trlib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES} m)
target_link_libraries(trlib ${LAPACK_LIBRARIES} ${BLAS_LIBRARIES})
if(NOT WIN32)
target_link_libraries(trlib m)
endif()
set_property(TARGET trlib PROPERTY C_STANDARD 11)

add_library("trlib::trlib" ALIAS trlib)
Expand All @@ -40,9 +43,15 @@ if(APPLE)
set_property(TARGET trlib PROPERTY INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
endif(APPLE)

if(MSVC)
set_property(TARGET trlib PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
endif()

install(TARGETS trlib
EXPORT trlib-config
DESTINATION lib)
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin)

install(EXPORT trlib-config
NAMESPACE "trlib::"
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if(CHECK_FOUND)
target_include_directories("test_${t}" PRIVATE "${PROJECT_BINARY_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}" ${CHECK_INCLUDE_DIRS})
add_test("test_${t}" "${CMAKE_CURRENT_BINARY_DIR}/test_${t}")

if(APPLE)
if(APPLE OR WIN32)
else()
add_custom_command(OUTPUT "test_${t}_valgrind.c" COMMAND sed "'/sr = srunner_create(s);/a srunner_set_fork_status(sr, CK_NOFORK);'" "${CMAKE_CURRENT_SOURCE_DIR}/test_${t}.c" > "test_${t}_valgrind.c" DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/test_${t}.c")
add_executable("test_${t}_valgrind" "test_${t}_valgrind.c" "${CMAKE_CURRENT_SOURCE_DIR}/trlib_test.c" ${MESSAGEFILES})
Expand Down

0 comments on commit 89cc5cf

Please sign in to comment.