Skip to content

Commit

Permalink
reverted commits
Browse files Browse the repository at this point in the history
  • Loading branch information
vackva committed Apr 24, 2024
1 parent 42079bd commit 5550098
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 12 deletions.
6 changes: 3 additions & 3 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/sofa"]
path = modules/sofa
url = https://github.com/vackva/libmysofa
[submodule "modules/libmysofa"]
path = modules/libmysofa
url = https://github.com/hoene/libmysofa.git
29 changes: 21 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,14 @@ add_subdirectory(modules/JUCE)

# Disable building tests for libmysofa
set(BUILD_TESTS OFF CACHE BOOL "Disable building tests" FORCE)

# Include the libmysofa project
add_subdirectory(modules/libmysofa)

# Disable building shared libraries for libmysofa
set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared instead of static libraries." FORCE)

if (MSVC)
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/sofa)
endif ()

add_subdirectory(modules/libmysofa)

juce_add_plugin(${TARGET_NAME}
# VERSION ... # Set this if the plugin version is different to the project version
Expand Down Expand Up @@ -89,3 +86,19 @@ target_link_libraries(${TARGET_NAME}
juce::juce_recommended_config_flags
juce::juce_recommended_lto_flags
juce::juce_recommended_warning_flags)


if (MSVC)
set(copy_shard_libs
"${CMAKE_CURRENT_SOURCE_DIR}/modules/OpenBLAS-${OPEN_BLAS_VERSION}/bin/libopenblas.dll"
)

foreach(FORMAT IN LISTS FORMATS_TO_BUILD)
string(CONCAT CONCATENATED_TARGET ${TARGET_NAME}_${FORMAT})
add_custom_command(TARGET ${CONCATENATED_TARGET}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${copy_shard_libs}
$<TARGET_FILE_DIR:${TARGET_NAME}>/${FORMAT})
endforeach()
endif (MSVC)
1 change: 1 addition & 0 deletions modules/libmysofa
Submodule libmysofa added at da9e4a
1 change: 0 additions & 1 deletion modules/sofa
Submodule sofa deleted from 9a9290

0 comments on commit 5550098

Please sign in to comment.