Merge branch 'main' of https://github.com/SleipnirGroup/TrajoptLib in…

…to use-sleipnir
SleipnirGroup · Feb 16, 2024 · cdfcde5 · cdfcde5
2 parents e0f095f + 299aea8
commit cdfcde5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -102,7 +102,7 @@ if(
     target_compile_definitions(fmt PRIVATE _GLIBCXX_USE_CXX11_ABI=0)
 endif()
 
-target_link_libraries(TrajoptLib PUBLIC fmt)
+target_link_libraries(TrajoptLib PUBLIC fmt::fmt)
 
 # json dependency
 set(BUILD_SHARED_LIBS_SAVE ${BUILD_SHARED_LIBS})
@@ -117,7 +117,7 @@ fetchcontent_declare(
 fetchcontent_makeavailable(nlohmann_json)
 set(BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS_SAVE})
 
-target_link_libraries(TrajoptLib PUBLIC nlohmann_json)
+target_link_libraries(TrajoptLib PUBLIC nlohmann_json::nlohmann_json)
 
 set(OPTIMIZER_BACKEND "casadi" CACHE STRING "Optimizer backend")
 set_property(CACHE OPTIMIZER_BACKEND PROPERTY STRINGS casadi sleipnir)

diff --git a/cmake/modules/FetchSleipnir.cmake b/cmake/modules/FetchSleipnir.cmake
@@ -4,7 +4,7 @@ macro(fetch_sleipnir)
     fetchcontent_declare(
         Sleipnir
         GIT_REPOSITORY https://github.com/SleipnirGroup/Sleipnir.git
-        # main on 2024-02-13
+        # main on 2024-02-15
         GIT_TAG b20cf8f393143e0c7aef08f9d7e728eb6afb6ad1
     )