Skip to content

Commit

Permalink
pord: simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
scivision committed Nov 1, 2021
1 parent 0a60aad commit 2272a29
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ if(MSVC AND BUILD_SHARED_LIBS)
cmake -DBUILD_SHARED_LIBS=off")
endif()

set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS true)

# --- user options
include(cmake/options.cmake)
include(cmake/libraries.cmake)
Expand Down Expand Up @@ -94,9 +96,8 @@ install(FILES

# --- MUMPS build

configure_file(PORD/CMakeLists.txt ${mumps_SOURCE_DIR}/PORD/ COPYONLY)
configure_file(PORD/lib/CMakeLists.txt ${mumps_SOURCE_DIR}/PORD/lib/ COPYONLY)
add_subdirectory(${mumps_SOURCE_DIR}/PORD ${mumps_BINARY_DIR}/PORD)
add_subdirectory(${mumps_SOURCE_DIR}/PORD/lib ${mumps_BINARY_DIR}/PORD/lib)

configure_file(src/CMakeLists.txt ${mumps_SOURCE_DIR}/src/ COPYONLY)
add_subdirectory(${mumps_SOURCE_DIR}/src ${mumps_BINARY_DIR}/src)
Expand Down
16 changes: 0 additions & 16 deletions PORD/CMakeLists.txt

This file was deleted.

17 changes: 16 additions & 1 deletion PORD/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1 +1,16 @@
target_sources(pord PRIVATE graph.c gbipart.c gbisect.c ddcreate.c ddbisect.c nestdiss.c multisector.c gelim.c bucket.c tree.c symbfac.c interface.c sort.c minpriority.c)
add_library(pord
graph.c gbipart.c gbisect.c ddcreate.c ddbisect.c nestdiss.c multisector.c gelim.c bucket.c tree.c symbfac.c interface.c sort.c minpriority.c
)
target_include_directories(pord
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include
INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
$<INSTALL_INTERFACE:include>
)
set_target_properties(pord PROPERTIES
EXPORT_NAME PORD
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}
)

install(TARGETS pord EXPORT ${PROJECT_NAME}Targets)

0 comments on commit 2272a29

Please sign in to comment.