Skip to content

Bugfixes for PR #1010 (CMake) #1530

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.

Sign up for GitHub

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

Merged
andrew-platt merged 2 commits into from
Apr 18, 2023
Merged

Bugfixes for PR #1010 (CMake) #1530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a03232
cmake: fix for nwtclib_obj compile
andrew-platt Apr 12, 2023
f2a3bc2
cmake: fix cmakelists.txt for map
andrew-platt Apr 12, 2023
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
4 changes: 2 additions & 2 deletions modules/map/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ endif()
file(GLOB MAP_CLIB_SOURCES src/*.c src/*.cc src/*/*.c src/*/*.cc)
file(GLOB MAP_C_HEADERS src/*.h src/*/*.h)

add_library(mapcpplib_obj OBJECT ${MAP_CLIB_SOURCES} src/MAP_Types.f90 src/MAP_Fortran_Types.f90)
add_library(mapcpplib_obj OBJECT ${MAP_CLIB_SOURCES})

target_include_directories(mapcpplib_obj PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/bstring>
Expand All @@ -52,7 +52,7 @@ set(MAP_F_SOURCES
src/MAP_Fortran_Types.f90
)

add_library(maplib_obj OBJECT src/map.f90)
add_library(maplib_obj OBJECT ${MAP_F_SOURCES})
target_link_libraries(maplib_obj mapcpplib_obj nwtclibs_obj)

add_library(maplib $<TARGET_OBJECTS:mapcpplib_obj> $<TARGET_OBJECTS:maplib_obj>)
Expand Down
2 changes: 1 addition & 1 deletion modules/nwtc-library/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ if (USE_LOCAL_STATIC_LAPACK)
endif()

add_library(nwtclibs_obj OBJECT ${NWTCLIBS_SOURCES})
target_link_libraries(nwtclibs_obj nwtcbaselib_obj ${LAPACK_LIBRARIES} ${CMAKE_DL_LIBS})
target_link_libraries(nwtclibs_obj nwtcbaselib_obj nwtcsyslib_obj ${LAPACK_LIBRARIES} ${CMAKE_DL_LIBS})
if (USE_LOCAL_STATIC_LAPACK)
add_dependencies(nwtclibs_obj lapack)
endif()
Expand Down