Permalink
Browse files

cmake (Windows): use CMAKE_LIBRARY_PATH for fixup_bundle() search dirs

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...
1 parent 3c2ebcc commit c1c57ee7b59a5183d97cc52aeb65d668a7e44316 @jleben jleben committed Nov 30, 2012
Showing with 2 additions and 7 deletions.
  1. +0 −5 CMakeLists.txt
  2. +1 −1 platform/windows/CMakeLists.txt
  3. +1 −1 platform/windows/bundle.cmake
View
@@ -181,11 +181,6 @@ if (SC_QT)
message( STATUS "Compiling with Qt GUI" )
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)
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).")
@@ -12,7 +12,7 @@ install(FILES ${CMAKE_SOURCE_DIR}/README_WINDOWS.txt
add_custom_target( bundle
COMMAND cmake
"-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"
COMMENT "Bundling the dependencies:"
VERBATIM
@@ -2,5 +2,5 @@ include(BundleUtilities)
fixup_bundle(
"${SC_INSTALL_PREFIX}/SuperCollider/sclang.exe"
""
- "${SC_WIN_DEP_DIRS}"
+ "${SC_DEPENDENCY_DIRS}"
)

0 comments on commit c1c57ee

Please sign in to comment.