Refactor CMakeLists.txt to adjust library linking and update build sc…

…ript for configurable installation
locaal-ai · Nov 5, 2024 · 4e80a23 · 4e80a23
1 parent c89c4cf
commit 4e80a23
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,8 @@ target_include_directories(moonshine
     ${ONNXRUNTIME_INCLUDE_DIRS}
 )
 
-target_link_libraries(moonshine PUBLIC Ort nlohmann_json::nlohmann_json)
+target_link_libraries(moonshine PUBLIC nlohmann_json::nlohmann_json)
+target_link_libraries(moonshine INTERFACE Ort)
 
 # Create example executable
 add_executable(moonshine_example examples/demo.cpp)

diff --git a/cmake/FetchOnnxruntime.cmake b/cmake/FetchOnnxruntime.cmake
@@ -61,11 +61,6 @@ if(APPLE)
   target_sources(Ort PRIVATE "${Onnxruntime_LIB}")
   set_property(SOURCE "${Onnxruntime_LIB}" PROPERTY MACOSX_PACKAGE_LOCATION Frameworks)
   source_group("Frameworks" FILES "${Onnxruntime_LIB}")
-  # # add a codesigning step
-  # add_custom_command(
-  #   TARGET "${CMAKE_PROJECT_NAME}"
-  #   PRE_BUILD VERBATIM
-  #   COMMAND /usr/bin/codesign --force --verify --verbose --sign "${CODESIGN_IDENTITY}" "${Onnxruntime_LIB}")
   add_custom_command(
     TARGET Ort
     POST_BUILD

diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -26,4 +26,4 @@ if ($LASTEXITCODE -eq 0) {
 }
 
 # Install to current directory
-cmake --install "$ROOT_DIR/build" --prefix "$ROOT_DIR/dist"
+cmake --install "$ROOT_DIR/build" --prefix "$ROOT_DIR/dist" --config $BuildType