Skip to content

Commit

Permalink
cmake (Windows): use CMAKE_LIBRARY_PATH for fixup_bundle() search dirs
Browse files Browse the repository at this point in the history
Instead of using a custom option, simply use CMAKE_LIBRARY_PATH. This
allows a unified way to specify directories searched by FindXxx cmake
modules as well as the bundling script.
  • Loading branch information
jleben committed Nov 30, 2012
1 parent 3c2ebcc commit c1c57ee
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -181,11 +181,6 @@ if (SC_QT)
message( STATUS "Compiling with Qt GUI" ) message( STATUS "Compiling with Qt GUI" )
endif (SC_QT) endif (SC_QT)


if(WIN32)
option(SC_WIN_DEP_DIRS
"A list of directories where dependencies will be searched for when packaging.")
endif()

if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
option(NATIVE "Optimize binary for this architecture (binaries may not run on other machines, requires gcc-4.3 or higher).") option(NATIVE "Optimize binary for this architecture (binaries may not run on other machines, requires gcc-4.3 or higher).")
option(LTO "Use GCC's link time optimizer' (experimental).") option(LTO "Use GCC's link time optimizer' (experimental).")
Expand Down
2 changes: 1 addition & 1 deletion platform/windows/CMakeLists.txt
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ install(FILES ${CMAKE_SOURCE_DIR}/README_WINDOWS.txt
add_custom_target( bundle add_custom_target( bundle
COMMAND cmake COMMAND cmake
"-DSC_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" "-DSC_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
"-DSC_WIN_DEP_DIRS=${SC_WIN_DEP_DIRS}" "-DSC_DEPENDENCY_DIRS=${CMAKE_LIBRARY_PATH}"
-P "${CMAKE_CURRENT_SOURCE_DIR}/bundle.cmake" -P "${CMAKE_CURRENT_SOURCE_DIR}/bundle.cmake"
COMMENT "Bundling the dependencies:" COMMENT "Bundling the dependencies:"
VERBATIM VERBATIM
Expand Down
2 changes: 1 addition & 1 deletion platform/windows/bundle.cmake
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ include(BundleUtilities)
fixup_bundle( fixup_bundle(
"${SC_INSTALL_PREFIX}/SuperCollider/sclang.exe" "${SC_INSTALL_PREFIX}/SuperCollider/sclang.exe"
"" ""
"${SC_WIN_DEP_DIRS}" "${SC_DEPENDENCY_DIRS}"
) )

0 comments on commit c1c57ee

Please sign in to comment.