Fix logic for windows & METIS

pull/12/head
Izaak Beekman 8 years ago
parent 3fba2964bb
commit 8173b8c1ec
No known key found for this signature in database
GPG Key ID: A93CE70D8021BD0F

@ -441,6 +441,7 @@ target_link_libraries(krylov PUBLIC base prec)
include(${CMAKE_CURRENT_LIST_DIR}/util/CMakeLists.txt) include(${CMAKE_CURRENT_LIST_DIR}/util/CMakeLists.txt)
if(WIN32) if(WIN32)
if(METIS_FOUND)
add_library(psb_util_C STATIC ${util_source_C_files}) add_library(psb_util_C STATIC ${util_source_C_files})
target_compile_definitions(psb_util_C target_compile_definitions(psb_util_C
PRIVATE -DWIN32 -D_LIB -DWIN64) PRIVATE -DWIN32 -D_LIB -DWIN64)
@ -450,9 +451,12 @@ if(WIN32)
POSITION_INDEPENDENT_CODE TRUE) POSITION_INDEPENDENT_CODE TRUE)
target_link_libraries(psb_util_C target_link_libraries(psb_util_C
PUBLIC kernel32 user32 shell32) PUBLIC kernel32 user32 shell32)
endif()
add_library(util ${util_source_files}) add_library(util ${util_source_files})
if(METIS_FOUND)
target_link_libraries(util target_link_libraries(util
PUBLIC psb_util_C) PUBLIC psb_util_C)
endif()
else() else()
add_library(psb_util_C OBJECT ${util_source_C_files}) add_library(psb_util_C OBJECT ${util_source_C_files})
add_library(util ${util_source_files} $<TARGET_OBJECTS:psb_util_C>) add_library(util ${util_source_files} $<TARGET_OBJECTS:psb_util_C>)
@ -489,14 +493,20 @@ install(TARGETS base prec krylov util
DESTINATION "${CMAKE_INSTALL_LIBDIR}" DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )
if(WIN32)
install(TARGETS psb_base_C
EXPORT ${CMAKE_PROJECT_NAME}-targets
# set(directory_list base prec krylov util test) # TODO: add cbind DESTINATION "${CMAKE_INSTALL_LIBDIR}"
# foreach(directory ${directory_list}) LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
# add_subdirectory("${directory}") )
# endforeach() if(METIS_FOUND)
#add_subdirectory(cbind) install(TARGETS psb_util_C
EXPORT ${CMAKE_PROJECT_NAME}-targets
DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)
endif()
endif()
#----------------- #-----------------
# Add PSBLAS tests # Add PSBLAS tests

Loading…
Cancel
Save