Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
514e21c6
Commit
514e21c6
authored
Apr 28, 2017
by
Jan Möbius
Browse files
Merge branch 'fix_sha512_test' into 'master'
Fix sha512 test See merge request
!9
parents
cec1d0af
01e92d18
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmake/CMakeLists.txt
View file @
514e21c6
...
...
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
file
(
SHA512
${
CMAKE_SOURCE_DIR
}
/CMakeLists.txt HASH_TOPLEVEL_CMAKEFILE
)
file
(
SHA512
${
CMAKE_SOURCE_DIR
}
/OpenFlipper/cmake/CMakeLists.txt HASH_LATEST_CMAKEFILE
)
if
(
NOT
${
HASH_TOPLEVEL_CMAKEFILE
}
EQUAL
${
HASH_LATEST_CMAKEFILE
}
)
if
(
NOT
${
HASH_TOPLEVEL_CMAKEFILE
}
STR
EQUAL
${
HASH_LATEST_CMAKEFILE
}
)
message
(
WARNING
"WARNING! Possibly Outdated toplevel CMakeLists.txt. Please update the toplevel copy by the file OpenFlipper/cmake/CMakeLists.txt ."
)
endif
()
...
...
@@ -189,7 +189,7 @@ endif()
# Configure the executables path for tests
# ========================================================================
if
(
APPLE
)
SET
(
OPENFLIPPER_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/Build/
OpenFlipper
.app/Contents/MacOS/
${
OPENFLIPPER_PRODUCT_STRING
}
"
)
SET
(
OPENFLIPPER_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/Build/
${
OPENFLIPPER_PRODUCT_STRING
}
.app/Contents/MacOS/
${
OPENFLIPPER_PRODUCT_STRING
}
"
)
elseif
(
WIN32
)
SET
(
OPENFLIPPER_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/Build/
${
OPENFLIPPER_PRODUCT_STRING
}
.exe"
)
else
()
...
...
@@ -463,7 +463,7 @@ if ( APPLE )
add_dependencies
(
fixbundle
${
OPENFLIPPER_PRODUCT_STRING
}
OpenFlipperPluginLib
${
OPENFLIPPER_PLUGINS
}
)
# install bundle
install
(
DIRECTORY
${
CMAKE_BINARY_DIR
}
/Build/
OpenFlipper
.app DESTINATION .
install
(
DIRECTORY
${
CMAKE_BINARY_DIR
}
/Build/
${
OPENFLIPPER_PRODUCT_STRING
}
.app DESTINATION .
USE_SOURCE_PERMISSIONS
)
# Extra target for building an OpenFlipper package on mac
...
...
cmake/OpenFlipper_common.cmake
View file @
514e21c6
...
...
@@ -14,7 +14,7 @@ macro (acg_modify_project_dirs)
file
(
MAKE_DIRECTORY
${
CMAKE_BINARY_DIR
}
/Build/
${
ACG_PROJECT_BINDIR
}
)
endif
()
elseif
(
APPLE
)
set
(
MAC_OPENFLIPPER_BASEDIR
"
OpenFlipper
.app/Contents/Resources"
)
set
(
MAC_OPENFLIPPER_BASEDIR
"
${
OPENFLIPPER_PRODUCT_STRING
}
.app/Contents/Resources"
)
set
(
ACG_PROJECT_DATADIR
"
${
MAC_OPENFLIPPER_BASEDIR
}
"
)
set
(
ACG_PROJECT_PLUGINDIR
"
${
MAC_OPENFLIPPER_BASEDIR
}
/Plugins"
)
set
(
ACG_PROJECT_LIBDIR
"
${
MAC_OPENFLIPPER_BASEDIR
}
/../MacOS"
)
...
...
cmake/fixbundle.cmake.in
View file @
514e21c6
...
...
@@ -40,8 +40,8 @@ endfunction(gp_item_default_embedded_path_override)
include (BundleUtilities)
# copy qt plugins to bundle
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/
OpenFlipper
.app/Contents/Resources/Plugins/*.so")
file (GLOB_RECURSE _qtplugins "@CMAKE_BINARY_DIR@/Build/
OpenFlipper
.app/Contents/Resources/QtPlugins/*.dylib")
file (GLOB _plugins "@CMAKE_BINARY_DIR@/Build/
@OPENFLIPPER_PRODUCT_STRING@
.app/Contents/Resources/Plugins/*.so")
file (GLOB_RECURSE _qtplugins "@CMAKE_BINARY_DIR@/Build/
@OPENFLIPPER_PRODUCT_STRING@
.app/Contents/Resources/QtPlugins/*.dylib")
foreach (_qtp ${_qtplugins})
get_filename_component(_dir "${_qtp}" PATH)
...
...
@@ -52,8 +52,8 @@ endforeach ()
SET( BU_CHMOD_BUNDLE_ITEMS TRUE)
# fix all dependencies
fixup_bundle (@CMAKE_BINARY_DIR@/Build/
OpenFlipper
.app "${_plugins};${_qtplugins}" "/usr/lib;${_qtdirs};@QWT6_LIBRARY_DIR@")
fixup_bundle (@CMAKE_BINARY_DIR@/Build/
@OPENFLIPPER_PRODUCT_STRING@
.app "${_plugins};${_qtplugins}" "/usr/lib;${_qtdirs};@QWT6_LIBRARY_DIR@")
# create qt plugin configuration file
file(WRITE "@CMAKE_BINARY_DIR@/Build/
OpenFlipper
.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins")
file(WRITE "@CMAKE_BINARY_DIR@/Build/
@OPENFLIPPER_PRODUCT_STRING@
.app/Contents/Resources/qt.conf" "[Paths]\nPlugins = Resources/QtPlugins")
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment