@@ -91,6 +91,12 @@ FetchContent_Declare(spline
9191 GIT_REPOSITORY https://github.com/AlfVII/spline.git)
9292FetchContent_MakeAvailable (spline)
9393include_directories ("${CMAKE_BINARY_DIR } /_deps/spline-src/src" )
94+
95+ FetchContent_Declare (levmar
96+ GIT_REPOSITORY https://github.com/AlfVII/levmar.git
97+ GIT_TAG main)
98+ FetchContent_MakeAvailable (levmar)
99+ include_directories ("${CMAKE_BINARY_DIR } /_deps/levmar-src" )
94100
95101
96102if (INCLUDE_MKF_TESTS)
@@ -125,17 +131,17 @@ add_custom_target(MAS ALL
125131
126132include_directories ("${MAS_DIRECTORY} " )
127133
128- message ("Using for Levmar: ${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6" )
129- if ( NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6 )
130- if ( NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6.tgz )
131- file (DOWNLOAD https://users.ics.forth.gr/~lourakis/levmar/levmar-2.6.tgz ${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6.tgz SHOW_PROGRESS )
132- endif ()
134+ # message("Using for Levmar: ${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6")
135+ # if( NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6 )
136+ # if( NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6.tgz )
137+ # file(DOWNLOAD https://users.ics.forth.gr/~lourakis/levmar/levmar-2.6.tgz ${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6.tgz SHOW_PROGRESS)
138+ # endif()
133139
134- execute_process (COMMAND ${CMAKE_COMMAND } -E tar -xzvf ${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6.tgz )
135- execute_process (COMMAND ${CMAKE_COMMAND } -E rename ${CMAKE_BINARY_DIR } /levmar-2.6 ${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6 )
136- endif ()
137- add_subdirectory ("${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6" "${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6" )
138- include_directories ("${CMAKE_CURRENT_BINARY_DIR } /_deps/levmar-2.6" )
140+ # execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xzvf ${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6.tgz)
141+ # execute_process(COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_BINARY_DIR}/levmar-2.6 ${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6)
142+ # endif()
143+ # add_subdirectory("${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6" "${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6")
144+ # include_directories("${CMAKE_CURRENT_BINARY_DIR}/_deps/levmar-2.6")
139145
140146file (GLOB SOURCES
141147 "src/*.cpp" )
@@ -165,7 +171,6 @@ add_dependencies(MKF MAS)
165171
166172cmrc_add_resource_library (insulation_standards ALIAS data::insulation_standards NAMESPACE insulationData src/data/insulation_standards/IEC_60664-1.json src/data/insulation_standards/IEC_60664-4.json src/data/insulation_standards/IEC_60664-5.json src/data/insulation_standards/IEC_62368-1.json src/data/insulation_standards/IEC_61558-1.json src/data/insulation_standards/IEC_61558-2-16.json src/data/insulation_standards/IEC_60335-1.json )
167173target_link_libraries (MKF ${LIBS} )
168- ADD_DEPENDENCIES (MKF levmar )
169174
170175set (DATA_LIST "" )
171176if (EMBED_MAS_DATA)
0 commit comments