From 377dc1af24d5803aac11fa70e369eae9c40e8b7f Mon Sep 17 00:00:00 2001 From: "R. van twisk" Date: Sat, 30 Nov 2019 12:22:16 +0100 Subject: OSX Build fixes --- cmake/opentrack-platform.cmake | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'cmake') diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 02c1b2f8..0ebe53a7 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -156,11 +156,13 @@ if(MSVC) endif() if(APPLE) - add_compile_definitions(-stdlib=libc++) + # Removed because of Macro error + # add_compile_definitions(-stdlib=libc++) add_link_options(-stdlib=libc++) - add_link_options(-framework Cocoa -framework CoreFoundation -framework Carbon) - link_libraries(objc z) + # Build failure cannot link to frameworks + #add_link_options(-framework Cocoa -framework CoreFoundation -framework Carbon) + #link_libraries(objc z) endif() if(NOT MSVC) -- cgit v1.2.3 From 9f3a745ba10235fa7aeda3b93703fdcf810e6948 Mon Sep 17 00:00:00 2001 From: "R. van twisk" Date: Sat, 30 Nov 2019 22:51:33 +0100 Subject: Added camera list support for OSX --- cmake/opentrack-qt.cmake | 6 +++--- compat/camera-names.cpp | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'cmake') diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index 8c92483c..a13afc97 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -3,12 +3,12 @@ if(WIN32) find_package(Qt5Gui REQUIRED COMPONENTS QWindowsIntegrationPlugin) endif() find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets LinguistTools Gui QUIET) -find_package(Qt5 COMPONENTS SerialPort QUIET) +find_package(Qt5 COMPONENTS SerialPort Multimedia QUIET) -set(MY_QT_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES}) +set(MY_QT_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Multimedia_LIBRARIES}) function(otr_install_qt_libs) - foreach(i Qt5::Core Qt5::Gui Qt5::Network Qt5::SerialPort Qt5::Widgets) + foreach(i Qt5::Core Qt5::Gui Qt5::Network Qt5::SerialPort Qt5::Widgets Qt5::Multimedia) if(NOT TARGET "${i}") continue() endif() diff --git a/compat/camera-names.cpp b/compat/camera-names.cpp index 69926e5a..40edba49 100644 --- a/compat/camera-names.cpp +++ b/compat/camera-names.cpp @@ -11,6 +11,10 @@ # include #endif +#ifdef __APPLE__ +# include +#endif + #ifdef __linux # include # include @@ -102,5 +106,12 @@ std::vector get_camera_names() } } #endif +#ifdef __APPLE__ + QList cameras = QCameraInfo::availableCameras(); + foreach (const QCameraInfo &cameraInfo, cameras) { + ret.push_back(cameraInfo.description()); + } +#endif + return ret; } -- cgit v1.2.3 From f92e25c733d1f436570752918594f4c703431479 Mon Sep 17 00:00:00 2001 From: "R. van twisk" Date: Mon, 2 Dec 2019 13:37:11 +0100 Subject: Fix find_package for Eigen3 --- cmake/FindEigen3.cmake | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'cmake') diff --git a/cmake/FindEigen3.cmake b/cmake/FindEigen3.cmake index b43208f9..bbad2298 100644 --- a/cmake/FindEigen3.cmake +++ b/cmake/FindEigen3.cmake @@ -9,6 +9,12 @@ # EIGEN3_FOUND - system has eigen lib with correct version # EIGEN3_INCLUDE_DIR - the eigen include directory # EIGEN3_VERSION - eigen version +# +# This module reads hints about search locations from +# the following enviroment variables: +# +# EIGEN3_ROOT +# EIGEN3_ROOT_DIR # Copyright (c) 2006, 2007 Montel Laurent, # Copyright (c) 2008, 2009 Gael Guennebaud, @@ -61,19 +67,29 @@ if (EIGEN3_INCLUDE_DIR) else (EIGEN3_INCLUDE_DIR) - find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library + # search first if an Eigen3Config.cmake is available in the system, + # if successful this would set EIGEN3_INCLUDE_DIR and the rest of + # the script will work as usual + find_package(Eigen3 ${Eigen3_FIND_VERSION} NO_MODULE QUIET) + + if(NOT EIGEN3_INCLUDE_DIR) + find_path(EIGEN3_INCLUDE_DIR NAMES signature_of_eigen3_matrix_library + HINTS + ENV EIGEN3_ROOT + ENV EIGEN3_ROOT_DIR PATHS ${CMAKE_INSTALL_PREFIX}/include ${KDE4_INCLUDE_DIR} PATH_SUFFIXES eigen3 eigen ) - + endif(NOT EIGEN3_INCLUDE_DIR) + if(EIGEN3_INCLUDE_DIR) _eigen3_check_version() endif(EIGEN3_INCLUDE_DIR) - #include(FindPackageHandleStandardArgs) - #find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR EIGEN3_VERSION_OK) mark_as_advanced(EIGEN3_INCLUDE_DIR) -- cgit v1.2.3 From 96316119fd57b1d5acdfc0ff51e1766a9311f11f Mon Sep 17 00:00:00 2001 From: "R. van Twisk" Date: Thu, 19 Dec 2019 21:07:19 +0100 Subject: Fix bundle creation OSX --- .gitignore | 1 + CMakeLists.txt | 9 ++++++- cmake/opentrack-boilerplate.cmake | 33 +++++++++++++++++-------- cmake/opentrack-hier.cmake | 21 ++++++++-------- cmake/opentrack-install.cmake | 2 ++ cmake/opentrack-platform.cmake | 20 +++++----------- cmake/opentrack-qt.cmake | 9 +++---- logic/CMakeLists.txt | 6 ++--- macosx/CMakeLists.txt | 6 ++--- macosx/Info.plist | 30 +++++++++++++++++++++++ macosx/PkgInfo | 1 + macosx/install-fail-tool | 10 ++++---- macosx/make-app-bundle.sh | 41 ++++++++++++++++---------------- macosx/opentrack.app/Contents/Info.plist | 26 -------------------- macosx/opentrack.app/Contents/PkgInfo | 1 - macosx/opentrack.sh | 2 +- migration/CMakeLists.txt | 2 +- modules.txt | 37 ++++++++++++++++++++++++++++ pose-widget/CMakeLists.txt | 2 +- x-plane-plugin/CMakeLists.txt | 15 ++++++++++-- 20 files changed, 171 insertions(+), 103 deletions(-) create mode 100644 macosx/Info.plist create mode 100644 macosx/PkgInfo delete mode 100644 macosx/opentrack.app/Contents/Info.plist delete mode 100644 macosx/opentrack.app/Contents/PkgInfo create mode 100644 modules.txt (limited to 'cmake') diff --git a/.gitignore b/.gitignore index 23394e5e..db6619b1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /.vs/ /CMakeSettings.json .gtm/ +.vscode diff --git a/CMakeLists.txt b/CMakeLists.txt index a7a95d2f..448d7667 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,8 +93,15 @@ function(otr_add_subdirs) foreach(k ${_globbed}) get_filename_component(k "${k}" DIRECTORY) - add_subdirectory("${k}") + # we want to compile macosx last so we can run proper install scripts + if (k MATCHES "macosx$") + set(o ${k}) + else() + add_subdirectory("${k}") + endif() endforeach() + # Add macosx last + add_subdirectory("${o}") endfunction() otr_add_subdirs() diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index ffa4ea02..7e9231ed 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -61,8 +61,8 @@ function(otr_glob_sources var) endfunction() function(otr_fixup_subsystem n) - otr_find_msvc_editbin(editbin-pathname) if(MSVC) + otr_find_msvc_editbin(editbin-pathname) set(subsystem WINDOWS) get_property(type TARGET "${n}" PROPERTY TYPE) if (NOT type STREQUAL "STATIC_LIBRARY") @@ -143,15 +143,17 @@ function(otr_module n_) set(arg_NO-I18N TRUE) endif() - if(NOT WIN32) - set(subsys "") - elseif(arg_WIN32-CONSOLE) - set(subsys "") - else() - set(subsys "WIN32") - endif() - if(arg_EXECUTABLE) + if (APPLE) + set(subsys "MACOSX_BUNDLE") + elseif(NOT WIN32) + set(subsys "") + elseif(arg_WIN32-CONSOLE) + set(subsys "") + else() + set(subsys "WIN32") + endif() + add_executable(${n} ${subsys} "${${n}-all}") set_target_properties(${n} PROPERTIES SUFFIX "${opentrack-binary-suffix}" @@ -216,12 +218,23 @@ function(otr_module n_) endif() if(NOT arg_NO-INSTALL) + # Librarys/executable if(arg_BIN) - install(TARGETS "${n}" + if (APPLE) + install(TARGETS "${n}" + RUNTIME DESTINATION ${opentrack-hier-bin} + BUNDLE DESTINATION ${opentrack-hier-bin} + LIBRARY DESTINATION ${opentrack-hier-bin}/opentrack.app/Contents/MacOS/ + RESOURCE DESTINATION ${opentrack-hier-bin}/opentrack.app/Resource + PERMISSIONS ${opentrack-perms-exec}) + else() + install(TARGETS "${n}" RUNTIME DESTINATION ${opentrack-hier-bin} LIBRARY DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec}) + endif() else() + # Plugins install(TARGETS "${n}" ${opentrack-hier-str} PERMISSIONS ${opentrack-perms-exec}) endif() diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index 7dcdb52d..c94c6d57 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -9,38 +9,41 @@ include_guard(GLOBAL) -set(opentrack-install-rpath "") if(APPLE) - set(opentrack-hier-pfx ".") - set(opentrack-hier-path "/") # MUST HAVE A TRAILING BACKSLASH + set(opentrack-hier-pfx "${CMAKE_INSTALL_PREFIX}/opentrack.app/Contents/MacOS/Plugins") + set(opentrack-hier-path "/Plugins/") # MUST HAVE A TRAILING BACKSLASH, Used in APP set(opentrack-hier-doc "/") # MUST HAVE A TRAILING BACKSLASH - set(opentrack-hier-bin ".") + set(opentrack-hier-bin "${CMAKE_INSTALL_PREFIX}") set(opentrack-doc-pfx "./doc") set(opentrack-doc-src-pfx "./source-code") - set(opentrack-i18n-pfx "./i18n") - set(opentrack-i18n-path "./i18n") + set(opentrack-i18n-pfx "opentrack.app/Contents/Resources") # used during install + set(opentrack-i18n-path "../Resources/i18n") # used in application + set(opentrack-install-rpath "./") + set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) elseif(WIN32) set(opentrack-hier-pfx "modules") set(opentrack-hier-path "/${opentrack-hier-pfx}/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-doc "/doc/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-bin ".") + set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) set(opentrack-doc-pfx "./doc") set(opentrack-doc-src-pfx "./source-code") set(opentrack-i18n-pfx "./i18n") set(opentrack-i18n-path "./i18n") set(opentrack-hier-debug "./debug") + set(opentrack-install-rpath "") else() set(opentrack-hier-pfx "libexec/opentrack") set(opentrack-hier-path "/../${opentrack-hier-pfx}/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-doc "/share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-bin "bin") + set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) set(opentrack-doc-pfx "./share/doc/opentrack") set(opentrack-doc-src-pfx "./share/doc/opentrack/source-code") set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-hier-pfx}") set(opentrack-i18n-pfx "./share/opentrack/i18n") set(opentrack-i18n-path "../share/opentrack/i18n") endif() -set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) function(otr_escape_string var str) string(REGEX REPLACE "([^_A-Za-z0-9./:-])" "\\\\\\1" str "${str}") @@ -50,9 +53,7 @@ endfunction() set(opentrack-contrib-pfx "${opentrack-doc-pfx}/contrib") set(opentrack-binary-suffix "") -if(APPLE) - set(opentrack-binary-suffix ".bin") -elseif(WIN32) +if(WIN32) set(opentrack-binary-suffix ".exe") endif() diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 2b745a82..784cf59a 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -71,9 +71,11 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") cleanup_visual_studio_debug() endif() +if (NOT APPLE) otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient64.dll") otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/NPClient.dll" "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll" "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe") +endif() \ No newline at end of file diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 0ebe53a7..35de63a4 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -43,10 +43,12 @@ set(CMAKE_CXX_STANDARD_DEFAULT 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS FALSE) -set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -set(CMAKE_SKIP_INSTALL_RPATH FALSE) -set(CMAKE_SKIP_RPATH FALSE) +IF (NOT APPLE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_SKIP_INSTALL_RPATH FALSE) + set(CMAKE_SKIP_RPATH FALSE) +endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC OFF) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) @@ -155,16 +157,6 @@ if(MSVC) endforeach() endif() -if(APPLE) - # Removed because of Macro error - # add_compile_definitions(-stdlib=libc++) - add_link_options(-stdlib=libc++) - - # Build failure cannot link to frameworks - #add_link_options(-framework Cocoa -framework CoreFoundation -framework Carbon) - #link_libraries(objc z) -endif() - if(NOT MSVC) include(FindPkgConfig) endif() diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index a13afc97..650db4fc 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -2,19 +2,20 @@ include_guard(GLOBAL) if(WIN32) find_package(Qt5Gui REQUIRED COMPONENTS QWindowsIntegrationPlugin) endif() -find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets LinguistTools Gui QUIET) +find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets LinguistTools Gui DBus QUIET) find_package(Qt5 COMPONENTS SerialPort Multimedia QUIET) -set(MY_QT_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Multimedia_LIBRARIES}) - +set(MY_QT_LIBS ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Multimedia_LIBRARIES}) function(otr_install_qt_libs) - foreach(i Qt5::Core Qt5::Gui Qt5::Network Qt5::SerialPort Qt5::Widgets Qt5::Multimedia) + foreach(i Qt5::Core Qt5::Gui Qt5::DBus Qt5::Network Qt5::SerialPort Qt5::Widgets Qt5::Multimedia) if(NOT TARGET "${i}") continue() endif() otr_install_lib(${i} ".") endforeach() + if(WIN32) otr_install_lib(Qt5::QWindowsIntegrationPlugin "./platforms") + endif() endfunction() otr_install_qt_libs() diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt index f3f128af..f3344798 100644 --- a/logic/CMakeLists.txt +++ b/logic/CMakeLists.txt @@ -1,7 +1,7 @@ otr_module(logic BIN) -target_link_libraries(opentrack-logic opentrack-spline) +target_link_libraries(${self} opentrack-spline) if(NOT WIN32) - target_link_libraries(opentrack-logic opentrack-qxt-mini) + target_link_libraries(${self} opentrack-qxt-mini) else() - target_link_libraries(opentrack-logic opentrack-dinput winmm) + target_link_libraries(${self} opentrack-dinput winmm) endif() diff --git a/macosx/CMakeLists.txt b/macosx/CMakeLists.txt index 89901251..8520e9e9 100644 --- a/macosx/CMakeLists.txt +++ b/macosx/CMakeLists.txt @@ -1,13 +1,11 @@ if(APPLE) otr_escape_string(srcdir "${CMAKE_SOURCE_DIR}") - otr_escape_string(bindir "${CMAKE_BINARY_DIR}") otr_escape_string(instdir "${CMAKE_INSTALL_PREFIX}") otr_escape_string(commit "${OPENTRACK_COMMIT}") install(CODE " - execute_process(COMMAND /bin/sh \"${srcdir}/macosx/make-app-bundle.sh\" + execute_process(COMMAND /bin/sh \"${srcdir}/macosx/make-app-bundle.sh\" \"${srcdir}/macosx\" \"${instdir}\" - \"${bindir}\" - \"${commit}\") + \"${commit}\") ") endif() diff --git a/macosx/Info.plist b/macosx/Info.plist new file mode 100644 index 00000000..38b8e0e7 --- /dev/null +++ b/macosx/Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + opentrack.sh + CFBundleIdentifier + com.github.opentrack + CFBundleName + opentrack + CFBundleIconFile + opentrack.icns + CFBundleVersion + @OPENTRACK-VERSION@ + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + APPL + CFBundleDisplayName + opentrack + CFBundleSignature + ???? + NSPrincipalClass + NSApplication + NSHighResolutionCapable + True + + diff --git a/macosx/PkgInfo b/macosx/PkgInfo new file mode 100644 index 00000000..6f749b0f --- /dev/null +++ b/macosx/PkgInfo @@ -0,0 +1 @@ +APPL???? diff --git a/macosx/install-fail-tool b/macosx/install-fail-tool index a5464c18..16284562 100755 --- a/macosx/install-fail-tool +++ b/macosx/install-fail-tool @@ -4,22 +4,22 @@ test -n "$1" || exit 1 dir="$1" -for i in "$dir"/* "$dir"/*/* "$dir"/*/*/*; do - { test -x "$i" && test -f "$i"; } || continue +for i in "$dir"/*; do + echo $i + { test -f "$i"; } || continue case "$i" in *.dll|*.exe) continue ;; *) : ;; esac - case "$i" in - *.dylib|*.bin) strip -x "$i" ;; esac echo ---- $i ---- install_name_tool -id "@executable_path/$(echo "$i" | sed -e "s,^$dir/,,")" "$i" otool -L "$i" | awk '{ print $1 }' | while read l; do j="$(basename -- "$l")" + echo === $j === if test -e "$dir/$j"; then - install_name_tool -change "$l" "@executable_path/$j" "$i" + install_name_tool -change "$l" "@rpath/$j" "$i" fi done done diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index 05259702..5181b141 100755 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -1,41 +1,42 @@ #!/bin/sh APPNAME=opentrack +# Alternative we could look at https://github.com/arl/macdeployqtfix ?? -dir="$1" +#macosx directory +dir="$1" test -n "$dir" || exit 1 +# install directory install="$2" test -n "$install" || exit 1 -output_dir="$3" -test -n "$output_dir" || exit 1 -version="$4" +version="$3" test -n "$version" || exit 1 tmp="$(mktemp -d "/tmp/$APPNAME-tmp.XXXXXXX")" test $? -eq 0 || exit 1 -rm -f -- "$install/.DS_Store" -sh "$dir/install-fail-tool" "$install" +# Add framework and other libraries +macdeployqt "$install/$APPNAME.app" -libpath="$install/$APPNAME.app/Contents/MacOS" -cp -R "$dir/opentrack.app" "$tmp/" || exit 1 -cp -R "$install" "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 -sed -i '' -e "s#@OPENTRACK-VERSION@#$version#g" "$tmp/$APPNAME.app/Contents/Info.plist" || exit 1 +# Fixup dylib linker issues +sh "$dir/install-fail-tool" "$install/$APPNAME.app/Contents/Frameworks" -mkdir "$tmp/$APPNAME.iconset" || exit 1 -mkdir "$tmp/$APPNAME.app/Contents/Resources" || exit 1 -cp "$dir"/opentrack.sh "$tmp/$APPNAME.app/Contents/MacOS" || exit 1 +# Copy our own plist and set correct version +cp "$dir/Info.plist" "$install/$APPNAME.app/Contents/" +cp "$dir/PkgInfo" "$install/$APPNAME.app/Contents/" +cp "$dir/opentrack.sh" "$install/$APPNAME.app/Contents/MacOS/" +sed -i '' -e "s#@OPENTRACK-VERSION@#$version#g" "$install/$APPNAME.app/Contents/Info.plist" || exit 1 +# Build iconset +mkdir "$tmp/$APPNAME.iconset" || exit 1 sips -z 16 16 "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1 sips -z 32 32 "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1 sips -z 32 32 "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1 sips -z 64 64 "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1 sips -z 128 128 "$dir/../gui/images/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || exit 1 - -iconutil -c icns -o "$tmp/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$APPNAME.iconset" -rm -r "$tmp/$APPNAME.iconset" - -cd "$tmp" || exit 1 -rm -f "$output_dir/$version-macosx.zip" -zip -9r "$output_dir/$version-macosx.zip" "$APPNAME.app" || exit 1 +iconutil -c icns -o "$install/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$APPNAME.iconset" rm -rf "$tmp" -ls -lh "$output_dir/$version-macosx.zip" + +# Zip it up +#zip -9r "$install/$version-macosx.zip" "$APPNAME.app" || exit 1 +#ls -lh "$install/$version-macosx.zip" diff --git a/macosx/opentrack.app/Contents/Info.plist b/macosx/opentrack.app/Contents/Info.plist deleted file mode 100644 index 41ca402a..00000000 --- a/macosx/opentrack.app/Contents/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - opentrack.sh - CFBundleIdentifier - com.github.opentrack - CFBundleName - opentrack - CFBundleIconFile - opentrack.icns - CFBundleVersion - @OPENTRACK-VERSION@ - CFBundleInfoDictionaryVersion - 6.0 - CFBundlePackageType - APPL - CFBundleDisplayName - opentrack - CFBundleSignature - ???? - - diff --git a/macosx/opentrack.app/Contents/PkgInfo b/macosx/opentrack.app/Contents/PkgInfo deleted file mode 100644 index b18f8c6c..00000000 --- a/macosx/opentrack.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPLopentrack diff --git a/macosx/opentrack.sh b/macosx/opentrack.sh index 74a911e2..788afe96 100755 --- a/macosx/opentrack.sh +++ b/macosx/opentrack.sh @@ -1,6 +1,6 @@ #!/bin/sh cd -- "$(dirname -- "$0")" && -exec ./opentrack.bin -platformpluginpath "$(pwd)" "$@" +exec ./opentrack -platformpluginpath "$(pwd)" "$@" exit 1 diff --git a/migration/CMakeLists.txt b/migration/CMakeLists.txt index b2dfac6d..effeddcb 100644 --- a/migration/CMakeLists.txt +++ b/migration/CMakeLists.txt @@ -1,5 +1,5 @@ otr_module(migration BIN) -target_link_libraries(opentrack-migration opentrack-logic opentrack-spline) +target_link_libraries(${self} opentrack-logic opentrack-spline) if(CMAKE_COMPILER_IS_CLANGXX) target_compile_options(${self} PRIVATE -Wno-weak-vtables) endif() diff --git a/modules.txt b/modules.txt new file mode 100644 index 00000000..c9c96a43 --- /dev/null +++ b/modules.txt @@ -0,0 +1,37 @@ +Not copied +-------------- +logic BIN target_link_libraries(${self} opentrack-spline) +migration BIN target_link_libraries(${self} opentrack-logic opentrack-spline) +pose-widget BIN #target_link_libraries(${self}) +user-interface BIN target_link_libraries(${self} opentrack-migration opentrack-logic opentrack-spline opentrack-pose-widget) + +copied and fixed +-------------- +api NO-COMPAT BIN +compat NO-COMPAT BIN +options NO-COMPAT BIN target_link_libraries(opentrack-options opentrack-compat) +qtx-mini NO-COMPAT BIN +spline BIN +video BIN + + +boiler +-------------- + if(NOT arg_NO-COMPAT) + target_link_libraries(${n} opentrack-api opentrack-options opentrack-compat) + endif() + +opentrack +-------------- +target_link_libraries(${self} opentrack-user-interface opentrack-version) + +from opentrack mainwindow +-------------- +Most lickly not used + foreach(k user-interface logic pose-widget migration spline) + target_link_libraries(${self} opentrack-${k}) + endforeach() + +trackmouse +-------------- +target_link_libraries(${self} opentrack-user-interface opentrack-version) \ No newline at end of file diff --git a/pose-widget/CMakeLists.txt b/pose-widget/CMakeLists.txt index fd109bc3..7c196e80 100644 --- a/pose-widget/CMakeLists.txt +++ b/pose-widget/CMakeLists.txt @@ -1,2 +1,2 @@ otr_module(pose-widget BIN) -target_link_libraries(opentrack-pose-widget) +#target_link_libraries(${self}) diff --git a/x-plane-plugin/CMakeLists.txt b/x-plane-plugin/CMakeLists.txt index 1d985091..54bcaf34 100644 --- a/x-plane-plugin/CMakeLists.txt +++ b/x-plane-plugin/CMakeLists.txt @@ -2,9 +2,13 @@ if(LINUX OR APPLE) set(SDK_XPLANE "" CACHE PATH "Path to the X-Plane SDK") if(SDK_XPLANE) - otr_module(xplane-plugin NO-QT) + if (APPLE) + otr_module(xplane-plugin NO-QT NO-INSTALL) + else() + otr_module(xplane-plugin NO-QT) + endif() # probably librt already included - #install(FILES ${opentrack-xplane-plugin-c} DESTINATION "${opentrack-doc-src-pfx}/opentrack-xplane-plugin") + #install(FILES ${opentrack-xplane-plugin-c} DESTINATION "opentrack-hier-pfx") target_include_directories(opentrack-xplane-plugin SYSTEM PUBLIC ${SDK_XPLANE}/CHeaders/XPLM) if(APPLE) @@ -15,6 +19,13 @@ if(LINUX OR APPLE) target_link_options(${self} PRIVATE "-F${SDK_XPLANE}/Libraries/Mac/" -framework XPLM) + + install(TARGETS "${self}" + RUNTIME DESTINATION ${opentrack-hier-bin}/xplane + BUNDLE DESTINATION ${opentrack-hier-bin}/xplane + LIBRARY DESTINATION ${opentrack-hier-bin}/xplane + PERMISSIONS ${opentrack-perms-exec}) + elseif(CMAKE_COMPILER_IS_GNUCXX) target_compile_options(${self} PRIVATE -DLIN -DXPLM200 -DXPLM210) target_link_options(${self} PRIVATE -rdynamic -nodefaultlibs) -- cgit v1.2.3 From 338b007abe10faa7ecf6004f1162b7a85d30f8f0 Mon Sep 17 00:00:00 2001 From: "R. van Twisk" Date: Fri, 20 Dec 2019 16:17:27 +0100 Subject: Build ps3eye --- cmake/FindLibUSB.cmake | 80 +++++++++++++++++++++++++++++++++++++++++++++ video-ps3eye/CMakeLists.txt | 10 ++---- 2 files changed, 83 insertions(+), 7 deletions(-) create mode 100644 cmake/FindLibUSB.cmake (limited to 'cmake') diff --git a/cmake/FindLibUSB.cmake b/cmake/FindLibUSB.cmake new file mode 100644 index 00000000..8d39db62 --- /dev/null +++ b/cmake/FindLibUSB.cmake @@ -0,0 +1,80 @@ +# - Find libusb for portable USB support +# +# If the LibUSB_ROOT environment variable +# is defined, it will be used as base path. +# The following standard variables get defined: +# LibUSB_FOUND: true if LibUSB was found +# LibUSB_INCLUDE_DIR: the directory that contains the include file +# LibUSB_LIBRARIES: the libraries + +IF(PKG_CONFIG_FOUND) + IF(DEPENDS_DIR) #Otherwise use System pkg-config path + SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPENDS_DIR}/libusb/lib/pkgconfig") + ENDIF() + SET(MODULE "libusb-1.0") + IF(CMAKE_SYSTEM_NAME MATCHES "Linux") + SET(MODULE "libusb-1.0>=1.0.20") + ENDIF() + IF(LibUSB_FIND_REQUIRED) + SET(LibUSB_REQUIRED "REQUIRED") + ENDIF() + PKG_CHECK_MODULES(LibUSB ${LibUSB_REQUIRED} ${MODULE}) + + FIND_LIBRARY(LibUSB_LIBRARY + NAMES ${LibUSB_LIBRARIES} + HINTS ${LibUSB_LIBRARY_DIRS} + ) + SET(LibUSB_LIBRARIES ${LibUSB_LIBRARY}) + + RETURN() +ENDIF() + +FIND_PATH(LibUSB_INCLUDE_DIRS + NAMES libusb.h + PATHS + "${DEPENDS_DIR}/libusb" + "${DEPENDS_DIR}/libusbx" + ENV LibUSB_ROOT + PATH_SUFFIXES + include + libusb + include/libusb-1.0 +) + +SET(LIBUSB_NAME libusb) + +FIND_LIBRARY(LibUSB_LIBRARIES + NAMES ${LIBUSB_NAME}-1.0 + PATHS + "${DEPENDS_DIR}/libusb" + "${DEPENDS_DIR}/libusbx" + ENV LibUSB_ROOT + PATH_SUFFIXES + x64/Release/dll + x64/Debug/dll + Win32/Release/dll + Win32/Debug/dll + MS64 + MS64/dll +) + +IF(WIN32) +FIND_FILE(LibUSB_DLL + ${LIBUSB_NAME}-1.0.dll + PATHS + "${DEPENDS_DIR}/libusb" + "${DEPENDS_DIR}/libusbx" + ENV LibUSB_ROOT + PATH_SUFFIXES + x64/Release/dll + x64/Debug/dll + Win32/Release/dll + Win32/Debug/dll + MS64 + MS64/dll +) +ENDIF() + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUSB FOUND_VAR LibUSB_FOUND + REQUIRED_VARS LibUSB_LIBRARIES LibUSB_INCLUDE_DIRS) \ No newline at end of file diff --git a/video-ps3eye/CMakeLists.txt b/video-ps3eye/CMakeLists.txt index 2fac5f9c..5adcf2b0 100644 --- a/video-ps3eye/CMakeLists.txt +++ b/video-ps3eye/CMakeLists.txt @@ -4,13 +4,9 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ps3eye-driver/CMakeLists.txt") add_subdirectory("ps3eye-driver") if(NOT MSVC) - if(PKG_CONFIG_FOUND) - pkg_check_modules(libusb "libusb-1.0" QUIET) - endif() - if(libusb_FOUND) - include_directories(SYSTEM ${libusb_INCLUDE_DIRS}) - link_libraries(${libusb_LIBRARIES}) - endif() + find_package(LibUSB REQUIRED) + include_directories(SYSTEM ${LibUSB_INCLUDE_DIRS}) + link_libraries(${LibUSB_LIBRARIES} -pthread) else() set(SDK_LIBUSB CACHE PATH "") if(SDK_LIBUSB) -- cgit v1.2.3 From b84e9dfedbbd16470532312e16ee03c50453d438 Mon Sep 17 00:00:00 2001 From: "R. van Twisk" Date: Fri, 27 Dec 2019 22:31:59 +0100 Subject: Add xplane and aruco Add documentsion, source and xplane to DMG --- cmake/opentrack-boilerplate.cmake | 2 +- cmake/opentrack-hier.cmake | 2 +- cmake/opentrack-platform.cmake | 7 +++++-- macosx/make-app-bundle.sh | 20 +++++++++++--------- 4 files changed, 18 insertions(+), 13 deletions(-) (limited to 'cmake') diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index 7e9231ed..958403cc 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -224,7 +224,7 @@ function(otr_module n_) install(TARGETS "${n}" RUNTIME DESTINATION ${opentrack-hier-bin} BUNDLE DESTINATION ${opentrack-hier-bin} - LIBRARY DESTINATION ${opentrack-hier-bin}/opentrack.app/Contents/MacOS/ + LIBRARY DESTINATION ${opentrack-hier-bin}/Library RESOURCE DESTINATION ${opentrack-hier-bin}/opentrack.app/Resource PERMISSIONS ${opentrack-perms-exec}) else() diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index c94c6d57..8e9e3db8 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -18,7 +18,7 @@ if(APPLE) set(opentrack-doc-src-pfx "./source-code") set(opentrack-i18n-pfx "opentrack.app/Contents/Resources") # used during install set(opentrack-i18n-path "../Resources/i18n") # used in application - set(opentrack-install-rpath "./") + set(opentrack-install-rpath "../Frameworks") set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) elseif(WIN32) set(opentrack-hier-pfx "modules") diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 35de63a4..bb7fb1f8 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -43,11 +43,15 @@ set(CMAKE_CXX_STANDARD_DEFAULT 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS FALSE) -IF (NOT APPLE) +if (NOT APPLE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_SKIP_INSTALL_RPATH FALSE) set(CMAKE_SKIP_RPATH FALSE) +else() + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_MACOSX_RPATH OFF) endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC OFF) @@ -56,7 +60,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) -set(CMAKE_MACOSX_RPATH OFF) if(NOT WIN32 AND NOT APPLE) include(opentrack-pkg-config) diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index 5453c2cc..fc78f428 100755 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -24,7 +24,7 @@ tmp="$(mktemp -d "/tmp/$APPNAME-tmp.XXXXXXX")" test $? -eq 0 || exit 1 # Add framework and other libraries -macdeployqt "$install/$APPNAME.app" -libpath="$install/$APPNAME.app/Contents/MacOS" +macdeployqt "$install/$APPNAME.app" -libpath="$install/Library" # Fixup dylib linker issues sh "$dir/install-fail-tool" "$install/$APPNAME.app/Contents/Frameworks" @@ -54,26 +54,28 @@ rm -rf "$tmp" #Build DMG #https://github.com/andreyvit/create-dmg -rm -rf $install/../$version.dmg +rm -rf $install/../*.dmg create-dmg \ --volname "$APPNAME" \ --volicon "$install/$APPNAME.app/Contents/Resources/$APPNAME.icns" \ --window-pos 200 120 \ --window-size 800 450 \ - --icon-size 100 \ + --icon-size 80 \ --background "$dir/dmgbackground.png" \ - --icon "$APPNAME.app" 200 190 \ + --icon "$APPNAME.app" 200 180 \ + --app-drop-link 420 180 \ --hide-extension "$APPNAME.app" \ - --app-drop-link 600 185 \ + --add-folder "Document" "$install/doc" 20 40 \ + --add-folder "source-code" "$install/source-code" 220 40 \ + --add-folder "Xplane-Plugin" "$install/xplane" 420 40 \ "$version.dmg" \ "$install/$APPNAME.app" # Check if we have a DMG otherwise fail -FILE=$install/../$version.dmg +FILE=$install/../$version.dmg if [ -f $FILE ]; then - ls -ial $install/../*.dmg - exit 0 + ls -ial $install/../*.dmg else - echo "Failed to create $FILE" + echo "Failed to create ${FILE}" exit 2 fi -- cgit v1.2.3 From b7624b7003540258036babd0fff5c71e52b956d1 Mon Sep 17 00:00:00 2001 From: Ries van Twisk Date: Sat, 28 Dec 2019 14:42:48 +0100 Subject: Cleanup bundle generation --- cmake/opentrack-hier.cmake | 8 +++---- cmake/opentrack-platform.cmake | 18 +++++++--------- macosx/Info.plist | 4 ++-- macosx/make-app-bundle.sh | 48 ++++++++++++++++++++++++------------------ macosx/opentrack.sh | 6 ------ opentrack/main-window.cpp | 2 +- 6 files changed, 42 insertions(+), 44 deletions(-) delete mode 100755 macosx/opentrack.sh (limited to 'cmake') diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index 8e9e3db8..13f876a5 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -10,7 +10,7 @@ include_guard(GLOBAL) if(APPLE) - set(opentrack-hier-pfx "${CMAKE_INSTALL_PREFIX}/opentrack.app/Contents/MacOS/Plugins") + set(opentrack-hier-pfx "Plugins") set(opentrack-hier-path "/Plugins/") # MUST HAVE A TRAILING BACKSLASH, Used in APP set(opentrack-hier-doc "/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-bin "${CMAKE_INSTALL_PREFIX}") @@ -18,14 +18,12 @@ if(APPLE) set(opentrack-doc-src-pfx "./source-code") set(opentrack-i18n-pfx "opentrack.app/Contents/Resources") # used during install set(opentrack-i18n-path "../Resources/i18n") # used in application - set(opentrack-install-rpath "../Frameworks") - set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) + set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/Library") elseif(WIN32) set(opentrack-hier-pfx "modules") set(opentrack-hier-path "/${opentrack-hier-pfx}/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-doc "/doc/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-bin ".") - set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) set(opentrack-doc-pfx "./doc") set(opentrack-doc-src-pfx "./source-code") set(opentrack-i18n-pfx "./i18n") @@ -37,13 +35,13 @@ else() set(opentrack-hier-path "/../${opentrack-hier-pfx}/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-doc "/share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-hier-bin "bin") - set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) set(opentrack-doc-pfx "./share/doc/opentrack") set(opentrack-doc-src-pfx "./share/doc/opentrack/source-code") set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-hier-pfx}") set(opentrack-i18n-pfx "./share/opentrack/i18n") set(opentrack-i18n-path "../share/opentrack/i18n") endif() +set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) function(otr_escape_string var str) string(REGEX REPLACE "([^_A-Za-z0-9./:-])" "\\\\\\1" str "${str}") diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index bb7fb1f8..23c18d52 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -43,16 +43,14 @@ set(CMAKE_CXX_STANDARD_DEFAULT 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS FALSE) -if (NOT APPLE) - set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - set(CMAKE_SKIP_INSTALL_RPATH FALSE) - set(CMAKE_SKIP_RPATH FALSE) -else() - set(CMAKE_SKIP_BUILD_RPATH FALSE) - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - set(CMAKE_MACOSX_RPATH OFF) -endif() +set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +set(CMAKE_SKIP_INSTALL_RPATH FALSE) +set(CMAKE_SKIP_RPATH FALSE) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC OFF) +set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) + set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC OFF) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) diff --git a/macosx/Info.plist b/macosx/Info.plist index 64572bf3..3fd8b614 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -1,11 +1,11 @@ - + CFBundleDevelopmentRegion en CFBundleExecutable - opentrack.sh + opentrack CFBundleIdentifier com.github.opentrack CFBundleName diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index fc78f428..b124d4a1 100755 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -13,42 +13,49 @@ APPNAME=opentrack #macosx directory dir="$1" -test -n "$dir" || exit 1 +test -n "$dir" # install directory install="$2" -test -n "$install" || exit 1 +test -n "$install" version="$3" -test -n "$version" || exit 1 +test -n "$version" tmp="$(mktemp -d "/tmp/$APPNAME-tmp.XXXXXXX")" -test $? -eq 0 || exit 1 +test $? -eq 0 -# Add framework and other libraries -macdeployqt "$install/$APPNAME.app" -libpath="$install/Library" -# Fixup dylib linker issues -sh "$dir/install-fail-tool" "$install/$APPNAME.app/Contents/Frameworks" +# Add rpath for application so it can find the libraries +#install_name_tool -add_rpath @executable_path/../Frameworks "$install/$APPNAME.app/Contents/MacOS/$APPNAME" # Copy our own plist and set correct version cp "$dir/Info.plist" "$install/$APPNAME.app/Contents/" +sed -i '' -e "s#@OPENTRACK-VERSION@#$version#g" "$install/$APPNAME.app/Contents/Info.plist" + +# Copy PkgInfo cp "$dir/PkgInfo" "$install/$APPNAME.app/Contents/" -cp "$dir/opentrack.sh" "$install/$APPNAME.app/Contents/MacOS/" -sed -i '' -e "s#@OPENTRACK-VERSION@#$version#g" "$install/$APPNAME.app/Contents/Info.plist" || exit 1 -# Create an 512 resolution size (for retina displays mostly) +# Copy plugins +mkdir -p "$install/$APPNAME.app/Contents/MacOS/Plugins" +cp -r "$install/Plugins" "$install/$APPNAME.app/Contents/MacOS/" + +# Add framework and other libraries and fixup other libraries +macdeployqt "$install/$APPNAME.app" -libpath="$install/Library" +sh "$dir/install-fail-tool" "$install/$APPNAME.app/Contents/Frameworks" + +# Create an 512 resolution size for the icon (for retina displays mostly) #gm convert -size 512x512 "$dir/../gui/images/opentrack.png" "$tmp/opentrack.png" convert "$dir/../gui/images/opentrack.png" -filter triangle -resize 512x512 "$tmp/opentrack.png" # Build iconset -mkdir "$tmp/$APPNAME.iconset" || exit 1 -sips -z 16 16 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" || exit 1 -sips -z 32 32 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" || exit 1 -sips -z 32 32 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" || exit 1 -sips -z 64 64 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" || exit 1 -sips -z 128 128 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" || exit 1 -sips -z 256 256 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_128x128@2x.png" || exit 1 -sips -z 512 512 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_256x256@2x.png" || exit 1 -sips -z 512 512 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_512x512.png" || exit 1 +mkdir "$tmp/$APPNAME.iconset" +sips -z 16 16 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16.png" +sips -z 32 32 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_16x16@2x.png" +sips -z 32 32 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32.png" +sips -z 64 64 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_32x32@2x.png" +sips -z 128 128 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_128x128.png" +sips -z 256 256 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_128x128@2x.png" +sips -z 512 512 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_256x256@2x.png" +sips -z 512 512 "$tmp/opentrack.png" --out "$tmp/$APPNAME.iconset/icon_512x512.png" iconutil -c icns -o "$install/$APPNAME.app/Contents/Resources/$APPNAME.icns" "$tmp/$APPNAME.iconset" rm -rf "$tmp" @@ -66,6 +73,7 @@ create-dmg \ --app-drop-link 420 180 \ --hide-extension "$APPNAME.app" \ --add-folder "Document" "$install/doc" 20 40 \ + --no-internet-enable \ --add-folder "source-code" "$install/source-code" 220 40 \ --add-folder "Xplane-Plugin" "$install/xplane" 420 40 \ "$version.dmg" \ diff --git a/macosx/opentrack.sh b/macosx/opentrack.sh deleted file mode 100755 index 788afe96..00000000 --- a/macosx/opentrack.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -cd -- "$(dirname -- "$0")" && -exec ./opentrack -platformpluginpath "$(pwd)" "$@" - -exit 1 diff --git a/opentrack/main-window.cpp b/opentrack/main-window.cpp index cd715216..9bacff6e 100644 --- a/opentrack/main-window.cpp +++ b/opentrack/main-window.cpp @@ -34,7 +34,7 @@ main_window::main_window() : State(OPENTRACK_BASE_PATH + OPENTRACK_LIBRARY_PATH) { ui.setupUi(this); -#if !defined _WIN32 && !defined __APPLE__ +#if !defined _WIN32 annoy_if_root(); #endif -- cgit v1.2.3 From f0065732b9d8dfb3357196350660e06811002225 Mon Sep 17 00:00:00 2001 From: Ries van Twisk Date: Mon, 30 Dec 2019 12:19:27 +0100 Subject: Removed unused FindLibUSB --- cmake/FindLibUSB.cmake | 80 -------------------------------------------------- 1 file changed, 80 deletions(-) delete mode 100644 cmake/FindLibUSB.cmake (limited to 'cmake') diff --git a/cmake/FindLibUSB.cmake b/cmake/FindLibUSB.cmake deleted file mode 100644 index 8d39db62..00000000 --- a/cmake/FindLibUSB.cmake +++ /dev/null @@ -1,80 +0,0 @@ -# - Find libusb for portable USB support -# -# If the LibUSB_ROOT environment variable -# is defined, it will be used as base path. -# The following standard variables get defined: -# LibUSB_FOUND: true if LibUSB was found -# LibUSB_INCLUDE_DIR: the directory that contains the include file -# LibUSB_LIBRARIES: the libraries - -IF(PKG_CONFIG_FOUND) - IF(DEPENDS_DIR) #Otherwise use System pkg-config path - SET(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${DEPENDS_DIR}/libusb/lib/pkgconfig") - ENDIF() - SET(MODULE "libusb-1.0") - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(MODULE "libusb-1.0>=1.0.20") - ENDIF() - IF(LibUSB_FIND_REQUIRED) - SET(LibUSB_REQUIRED "REQUIRED") - ENDIF() - PKG_CHECK_MODULES(LibUSB ${LibUSB_REQUIRED} ${MODULE}) - - FIND_LIBRARY(LibUSB_LIBRARY - NAMES ${LibUSB_LIBRARIES} - HINTS ${LibUSB_LIBRARY_DIRS} - ) - SET(LibUSB_LIBRARIES ${LibUSB_LIBRARY}) - - RETURN() -ENDIF() - -FIND_PATH(LibUSB_INCLUDE_DIRS - NAMES libusb.h - PATHS - "${DEPENDS_DIR}/libusb" - "${DEPENDS_DIR}/libusbx" - ENV LibUSB_ROOT - PATH_SUFFIXES - include - libusb - include/libusb-1.0 -) - -SET(LIBUSB_NAME libusb) - -FIND_LIBRARY(LibUSB_LIBRARIES - NAMES ${LIBUSB_NAME}-1.0 - PATHS - "${DEPENDS_DIR}/libusb" - "${DEPENDS_DIR}/libusbx" - ENV LibUSB_ROOT - PATH_SUFFIXES - x64/Release/dll - x64/Debug/dll - Win32/Release/dll - Win32/Debug/dll - MS64 - MS64/dll -) - -IF(WIN32) -FIND_FILE(LibUSB_DLL - ${LIBUSB_NAME}-1.0.dll - PATHS - "${DEPENDS_DIR}/libusb" - "${DEPENDS_DIR}/libusbx" - ENV LibUSB_ROOT - PATH_SUFFIXES - x64/Release/dll - x64/Debug/dll - Win32/Release/dll - Win32/Debug/dll - MS64 - MS64/dll -) -ENDIF() - -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibUSB FOUND_VAR LibUSB_FOUND - REQUIRED_VARS LibUSB_LIBRARIES LibUSB_INCLUDE_DIRS) \ No newline at end of file -- cgit v1.2.3 From 18cbd25f2e3ed59bb9f20ba314d603df0eb46c1d Mon Sep 17 00:00:00 2001 From: Ries van Twisk Date: Sat, 4 Jan 2020 08:30:24 +0100 Subject: Handled review comments --- cmake/opentrack-platform.cmake | 4 ---- pose-widget/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'cmake') diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 23c18d52..96d306fa 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -51,10 +51,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC OFF) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) -set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOMOC OFF) -set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) - set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) diff --git a/pose-widget/CMakeLists.txt b/pose-widget/CMakeLists.txt index 7c196e80..28dc918b 100644 --- a/pose-widget/CMakeLists.txt +++ b/pose-widget/CMakeLists.txt @@ -1,2 +1,2 @@ otr_module(pose-widget BIN) -#target_link_libraries(${self}) +target_link_libraries(${self}) -- cgit v1.2.3 From 2d709bb4755305342b79a1574c90b2be348b4c4d Mon Sep 17 00:00:00 2001 From: Ries van Twisk Date: Sun, 5 Jan 2020 21:58:43 +0100 Subject: Copy third party DLL/EXE to third party direcoty for WINE users --- cmake/opentrack-install.cmake | 12 +++++++----- macosx/make-app-bundle.sh | 3 ++- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'cmake') diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 784cf59a..d464936c 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -71,11 +71,13 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") cleanup_visual_studio_debug() endif() -if (NOT APPLE) -otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") -otr_install_exec("${opentrack-hier-pfx}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient64.dll") -otr_install_exec("${opentrack-hier-pfx}" FILES +# For now copy third party needed files into a seperate direcvtory instead of the plugins directory +if (APPLE) + set(OSX_POST_INSTALL_DIR "/../thirdparty") +endif() +otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient.dll") +otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/freetrackclient64.dll") +otr_install_exec("${opentrack-hier-pfx}${OSX_POST_INSTALL_DIR}" FILES "${CMAKE_SOURCE_DIR}/bin/NPClient.dll" "${CMAKE_SOURCE_DIR}/bin/NPClient64.dll" "${CMAKE_SOURCE_DIR}/bin/TrackIR.exe") -endif() \ No newline at end of file diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index b124d4a1..9265eeb9 100755 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -72,10 +72,11 @@ create-dmg \ --icon "$APPNAME.app" 200 180 \ --app-drop-link 420 180 \ --hide-extension "$APPNAME.app" \ - --add-folder "Document" "$install/doc" 20 40 \ --no-internet-enable \ + --add-folder "Document" "$install/doc" 20 40 \ --add-folder "source-code" "$install/source-code" 220 40 \ --add-folder "Xplane-Plugin" "$install/xplane" 420 40 \ + --add-folder "thirdparty" "$install/thirdparty" 620 40 \ "$version.dmg" \ "$install/$APPNAME.app" -- cgit v1.2.3