Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

move fixupbundle.cmake.in and improve finding it

  • Loading branch information...
commit 57f63d80b93bb6533e0ce2af7832a5845fafc30f 1 parent bcc9e7b
@rpavlik authored
View
10 FindVRJuggler22.cmake
@@ -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
11 FindVRJuggler30.cmake
@@ -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
View
0  package/macosx/fixupbundle.cmake.in → package/fixupbundle.cmake.in
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.