diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-31 18:41:48 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-31 18:41:48 +0100 |
| commit | a1d93782b084354821dcb6d6cc03fc449b4d9f9a (patch) | |
| tree | 489cd2b7b0706b1c1f7ee68b8a121d886214260f | |
| parent | c8fa7f5edd4a48bd87c9781a20a1227868372768 (diff) | |
fix osx install bundle orderopentrack-2.3-rc20p1
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/opentrack-install.cmake | 10 | ||||
| -rw-r--r-- | macosx/CMakeLists.txt | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index aa6f988e..26cc2518 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ file(GLOB opentrack-subprojects "csv/${C}" "pose-widget/${C}" "spline-widget/${C}" + "macosx/${C}" ) foreach(i ${opentrack-subprojects}) get_filename_component(i ${i} DIRECTORY) diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 8e3d0420..598572fa 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -15,13 +15,3 @@ install(FILES "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll" "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe" DESTINATION . ${opentrack-perms}) - -if(APPLE) - install(CODE " - execute_process(COMMAND /bin/sh \"${CMAKE_SOURCE_DIR}/macosx/make-app-bundle.sh\" - \"${CMAKE_SOURCE_DIR}/macosx\" - \"${CMAKE_INSTALL_PREFIX}\" - \"${CMAKE_BINARY_DIR}\" - \"${OPENTRACK_COMMIT}\") - ") -endif() diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt new file mode 100644 index 00000000..214ea676 --- /dev/null +++ b/macosx/CMakeLists.txt @@ -0,0 +1,9 @@ +if(APPLE) + install(CODE " + execute_process(COMMAND /bin/sh \"${CMAKE_SOURCE_DIR}/macosx/make-app-bundle.sh\" + \"${CMAKE_SOURCE_DIR}/macosx\" + \"${CMAKE_INSTALL_PREFIX}\" + \"${CMAKE_BINARY_DIR}\" + \"${OPENTRACK_COMMIT}\") + ") +endif() |