Permalink
Browse files

move fixupbundle.cmake.in and improve finding it

  • Loading branch information...
1 parent bcc9e7b commit 57f63d80b93bb6533e0ce2af7832a5845fafc30f @rpavlik committed Feb 18, 2011
Showing with 13 additions and 8 deletions.
  1. +6 −4 FindVRJuggler22.cmake
  2. +7 −4 FindVRJuggler30.cmake
  3. 0 package/{macosx → }/fixupbundle.cmake.in
View
@@ -451,6 +451,9 @@ function(get_vrjuggler_bundle_sources _target_sources)
endif()
endfunction()
+get_filename_component(_vrjuggler22moddir
+ ${CMAKE_CURRENT_LIST_FILE}
+ PATH)
function(fixup_vrjuggler_app_bundle
_target
_targetInstallDest
@@ -461,9 +464,8 @@ function(fixup_vrjuggler_app_bundle
return()
endif()
- if(NOT MACOSX_PACKAGE_DIR)
- set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx)
- endif()
+ set(PACKAGE_DIR ${_vrjuggler22moddir}/package)
+ set(MACOSX_PACKAGE_DIR ${PACKAGE_DIR}/macosx)
set(TARGET_LOCATION
"${_targetInstallDest}/${_target}${CMAKE_EXECUTABLE_SUFFIX}")
@@ -495,7 +497,7 @@ function(fixup_vrjuggler_app_bundle
set(BUNDLE_LIBS ${_extralibs})
set(BUNDLE_LIB_DIRS "${VRJUGGLER22_VJ_BASE_DIR}" ${_libdirs})
- configure_file(${MACOSX_PACKAGE_DIR}/fixupbundle.cmake.in
+ configure_file(${PACKAGE_DIR}/fixupbundle.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle-juggler.cmake
@ONLY)
install(SCRIPT
View
@@ -447,6 +447,9 @@ function(get_vrjuggler_bundle_sources _target_sources)
endif()
endfunction()
+get_filename_component(_vrjuggler30moddir
+ ${CMAKE_CURRENT_LIST_FILE}
+ PATH)
function(fixup_vrjuggler_app_bundle
_target
_targetInstallDest
@@ -457,9 +460,9 @@ function(fixup_vrjuggler_app_bundle
return()
endif()
- if(NOT MACOSX_PACKAGE_DIR)
- set(MACOSX_PACKAGE_DIR ${CMAKE_SOURCE_DIR}/cmake/package/macosx)
- endif()
+
+ set(PACKAGE_DIR ${_vrjuggler30moddir}/package)
+ set(MACOSX_PACKAGE_DIR ${PACKAGE_DIR}/macosx)
set(TARGET_LOCATION
"${_targetInstallDest}/${_target}${CMAKE_EXECUTABLE_SUFFIX}")
@@ -491,7 +494,7 @@ function(fixup_vrjuggler_app_bundle
set(BUNDLE_LIBS ${_extralibs})
set(BUNDLE_LIB_DIRS "${VRJUGGLER30_VJ_BASE_DIR}" ${_libdirs})
- configure_file(${MACOSX_PACKAGE_DIR}/fixupbundle.cmake.in
+ configure_file(${PACKAGE_DIR}/fixupbundle.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/${_target}-fixupbundle-juggler.cmake
@ONLY)
install(SCRIPT
File renamed without changes.

0 comments on commit 57f63d8

Please sign in to comment.