Skip to content
Snippets Groups Projects
Commit 82c57d16 authored by Lars Bilke's avatar Lars Bilke Committed by Dmitri Naumov
Browse files

[Jenkins] Fix linker error on mac shared.

parent 3e5df62f
No related branches found
No related tags found
No related merge requests found
set(SOURCES add_library(OGSFileConverterLib
FileListDialog.h
OGSFileConverter.h
FileListDialog.cpp FileListDialog.cpp
OGSFileConverter.cpp OGSFileConverter.cpp
) )
target_link_libraries(OGSFileConverterLib
include_directories( PUBLIC ApplicationsFileIO MathLib QtBase ${VTK_LIBRARIES}
# Qt generated file includes INTERFACE MeshLib
${CMAKE_CURRENT_BINARY_DIR}
# Workaround for CMake 3.8
${CMAKE_CURRENT_BINARY_DIR}/OGSFileConverterLib_autogen/include
) )
add_library(OGSFileConverterLib target_include_directories(OGSFileConverterLib PUBLIC
${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/OGSFileConverterLib_autogen/include)
${HEADERS}
) set_target_properties(OGSFileConverterLib PROPERTIES
target_link_libraries(OGSFileConverterLib AUTOMOC TRUE
PUBLIC QtBase MathLib AUTOUIC TRUE
INTERFACE MeshLib ApplicationsFileIO
) )
add_executable(OGSFileConverter main.cpp) add_executable(OGSFileConverter main.cpp)
target_link_libraries(OGSFileConverter target_link_libraries(OGSFileConverter
OGSFileConverterLib PUBLIC OGSFileConverterLib ApplicationsFileIO
ApplicationsFileIO
) )
set_target_properties(OGSFileConverter OGSFileConverterLib set_target_properties(OGSFileConverter OGSFileConverterLib
PROPERTIES PROPERTIES
FOLDER "Utilities" FOLDER "Utilities"
AUTOMOC ON
AUTOUIC ON
) )
if(OGS_USE_PCH) if(OGS_USE_PCH)
...@@ -41,7 +35,5 @@ endif() ...@@ -41,7 +35,5 @@ endif()
#################### ####################
### Installation ### ### Installation ###
#################### ####################
install(TARGETS OGSFileConverter RUNTIME DESTINATION bin COMPONENT ogs_cli) install(TARGETS OGSFileConverter RUNTIME DESTINATION bin COMPONENT ogs_cli)
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "OGSFileConverter" "File Converter") set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} "OGSFileConverter" "File Converter")
set(CPACK_NSIS_MENU_LINKS ${CPACK_NSIS_MENU_LINKS} "bin/OGSFileConverter.exe" "File Converter" PARENT_SCOPE)
...@@ -14,7 +14,7 @@ target_compile_definitions(ProcessLibSourceTermPython ...@@ -14,7 +14,7 @@ target_compile_definitions(ProcessLibSourceTermPython
PUBLIC OGS_USE_PYTHON) PUBLIC OGS_USE_PYTHON)
target_link_libraries(ProcessLibSourceTermPython target_link_libraries(ProcessLibSourceTermPython
PUBLIC BaseLib MathLib MeshLib NumLib logog PUBLIC BaseLib MathLib MeshLib NumLib logog ${Python_LIBRARIES}
PRIVATE pybind11::pybind11) PRIVATE pybind11::pybind11)
# For the embedded Python module # For the embedded Python module
......
...@@ -23,6 +23,9 @@ include_directories(BEFORE ${METIS_PATH}/libmetis) ...@@ -23,6 +23,9 @@ include_directories(BEFORE ${METIS_PATH}/libmetis)
file(GLOB metis_sources ${METIS_PATH}/libmetis/*.c) file(GLOB metis_sources ${METIS_PATH}/libmetis/*.c)
# Build libmetis. # Build libmetis.
add_library(metis ${GKlib_sources} ${metis_sources}) add_library(metis ${GKlib_sources} ${metis_sources})
if(OPENMP_FOUND)
target_link_libraries(metis OpenMP::OpenMP_C)
endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
install(TARGETS metis LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS metis LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment