Skip to content

Commit

Permalink
corrected submodule path
Browse files Browse the repository at this point in the history
  • Loading branch information
vackva committed Apr 24, 2024
1 parent e2d2282 commit 42079bd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "modules/JUCE"]
path = modules/JUCE
url = https://github.com/juce-framework/JUCE
[submodule "modules/libmysofa"]
path = modules/libmysofa
[submodule "modules/sofa"]
path = modules/sofa
url = https://github.com/vackva/libmysofa
8 changes: 3 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@ set(BUILD_TESTS OFF CACHE BOOL "Disable building tests" FORCE)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared instead of static libraries." FORCE)

if (MSVC)
set(ZLIB_LIBRARY "${CMAKE_CURRENT_SOURCE_DIR}/modules/libmysofa/windows/third-party/zlib-1.2.11/lib")
set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/modules/libmysofa/windows/third-party/zlib-1.2.11/include")
link_directories("${CMAKE_CURRENT_SOURCE_DIR}/modules/libmysofa/windows/third-party/zlib-1.2.11/lib")
add_subdirectory(modules/libmysofa)
link_directories("${CMAKE_CURRENT_SOURCE_DIR}/modules/sofa/windows/third-party/zlib-1.2.11/lib")
add_subdirectory(modules/sofa)
else()
# Include the libmysofa project
add_subdirectory(modules/libmysofa)
add_subdirectory(modules/sofa)
endif ()


Expand Down
1 change: 1 addition & 0 deletions modules/sofa
Submodule sofa added at 9a9290

0 comments on commit 42079bd

Please sign in to comment.