| 1 | From edfff0027c3cdacbbc0f288078366058f598544d Mon Sep 17 00:00:00 2001
|
| 2 | From: "Artyom V. Poptsov" <[email protected]>
|
| 3 | Date: Wed, 14 Aug 2024 07:57:20 +0300
|
| 4 | Subject: [PATCH] CMakeLists.txt: Adjust to use system libraries.
|
| 5 |
|
| 6 | * CMakeLists.txt: Adjust to use system-provided mmg and yaml-cpp libraries.
|
| 7 | ---
|
| 8 | CMakeLists.txt | 38 ++++++--------------------------------
|
| 9 | 1 file changed, 6 insertions(+), 32 deletions(-)
|
| 10 |
|
| 11 | diff --git a/CMakeLists.txt b/CMakeLists.txt
|
| 12 | index ca2a01f9..c6eff22f 100755
|
| 13 | |
| 14 | |
| 15 | @@ -113,28 +113,8 @@ endif()
|
| 16 |
|
| 17 | # Mmg and its components
|
| 18 | # MMG
|
| 19 | - set(MMG_PREFIX mmg3d)
|
| 20 | - set(MMG_PREFIX_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX})
|
| 21 | - set(MMG_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${MMG_PREFIX})
|
| 22 | - ExternalProject_Add(${MMG_PREFIX}
|
| 23 | - PREFIX ${MMG_PREFIX_DIR}
|
| 24 | - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/mmg
|
| 25 | -
|
| 26 | - BUILD_ALWAYS OFF
|
| 27 | - INSTALL_DIR ${MMG_INSTALL_DIR}
|
| 28 | -
|
| 29 | - CMAKE_ARGS(-DCMAKE_BUILD_TYPE=Release -DBUILD=MMG3D -DLIBMMG3D_STATIC=ON
|
| 30 | - -DLIBMMG3D_SHARED=OFF -DUSE_ELAS=OFF -DUSE_VTK=OFF -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>)
|
| 31 | -
|
| 32 | - BUILD_COMMAND make
|
| 33 | - INSTALL_COMMAND make install
|
| 34 | - )
|
| 35 | - set(MMG3D_INCLUDE_DIRS "${MMG_INSTALL_DIR}/include")
|
| 36 | - set(MMG3D_LIBRARIES "${MMG_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}${MMG_PREFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
|
| 37 | -
|
| 38 | - include_directories(${MMG3D_INCLUDE_DIRS})
|
| 39 | - #add_library(MMG3D STATIC IMPORTED)
|
| 40 | - #set_target_properties(MMG3D PROPERTIES IMPORTED_LOCATION "${MMG3D_LIBRARIES}")
|
| 41 | + include_directories(${MMG_INCLUDE_DIR})
|
| 42 | + set(MMG3D_LIBRARIES ${MMG_LIBRARY_DIR}/libmmg3d.so)
|
| 43 |
|
| 44 | # MshMet
|
| 45 | set(MSHMET_PREFIX mshmet)
|
| 46 | @@ -174,14 +154,8 @@ target_include_directories(alg PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/alglib/sr
|
| 47 | include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libs/mTT/include)
|
| 48 |
|
| 49 | # yaml
|
| 50 | -file(GLOB yaml_SRC CONFIGURE_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src/*.cpp) # Using file GLOB is not recomended!
|
| 51 | -add_library(yaml STATIC)
|
| 52 | -target_include_directories(yaml
|
| 53 | - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/include
|
| 54 | - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/libs/yaml/src
|
| 55 | -)
|
| 56 | -target_sources(yaml PRIVATE ${yaml_SRC})
|
| 57 | -set_target_properties(yaml PROPERTIES CXX_STANDARD 11)
|
| 58 | +find_package(yaml-cpp REQUIRED)
|
| 59 | +include_directories(${YAML_CPP_INCLUDE_DIRS})
|
| 60 |
|
| 61 | # Compile options for debuging
|
| 62 | if(CMAKE_BUILD_TYPE MATCHES Debug)
|
| 63 | @@ -218,7 +192,7 @@ endif()
|
| 64 |
|
| 65 | # Create entries for C++ files in "ASLI" routine
|
| 66 | add_dependencies(ASLI ${MMG_PREFIX} ${MSHMET_PREFIX})
|
| 67 | -target_link_libraries(ASLI PUBLIC alg yaml
|
| 68 | +target_link_libraries(ASLI PUBLIC alg ${YAML_CPP_LIBRARIES}
|
| 69 | CGAL::CGAL CGAL::Eigen_support
|
| 70 | ${MMG3D_LIBRARIES} ${MSHMET_LIBRARIES}
|
| 71 | )
|
| 72 | @@ -301,4 +275,4 @@ if(MSYS AND ASLI_DLL)
|
| 73 | $<TARGET_FILE_DIR:ASLI>
|
| 74 | )
|
| 75 | endif()
|
| 76 | -endif()
|
| 77 | \ No newline at end of file
|
| 78 | +endif()
|
| 79 | --
|
| 80 | 2.45.2
|
| 81 |
|