Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kumir2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Никита Бесшапошников
kumir2
Commits
85216863
Commit
85216863
authored
Mar 23, 2018
by
Admin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MacOS build
parent
40664b90
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
22 deletions
+25
-22
cmake/kumir2/kumir2_apple.cmake
cmake/kumir2/kumir2_apple.cmake
+12
-12
src/app/CMakeLists.txt
src/app/CMakeLists.txt
+9
-7
src/app/kumir2-macx/CMakeLists.txt
src/app/kumir2-macx/CMakeLists.txt
+3
-2
src/app/kumir2-macx/splashscreen-macx.png
src/app/kumir2-macx/splashscreen-macx.png
+0
-0
src/app/kumir2-macx/window-icon-macx.png
src/app/kumir2-macx/window-icon-macx.png
+0
-0
src/plugins/coursemanager/coursemanager_plugin.cpp
src/plugins/coursemanager/coursemanager_plugin.cpp
+1
-1
No files found.
cmake/kumir2/kumir2_apple.cmake
View file @
85216863
...
...
@@ -2,18 +2,18 @@
# Build filesystem layout, according to LSB
set
(
KUMIR2_EXEC_DIR
"Kumir.app/Contents/MacOS"
)
# executable binaries
set
(
KUMIR2_LIBS_DIR
"Kumir.app/Contents/
PlugIns"
)
# shared libraries
set
(
KUMIR2_LIBS_DIR
"Kumir.app/Contents/
MacOS"
)
# shared libraries
set
(
KUMIR2_PLUGINS_DIR
"Kumir.app/Contents/PlugIns"
)
# libraries to be load at run time
set
(
KUMIR2_RESOURCES_DIR
"Kumir.app/Contents/Resources"
)
# non-executable resources
set
(
KUMIR2_LIBEXECS_DIR
"Kumir.app/Contents/MacOS"
)
# executable supplementary binaries
# clear default CMake RPATH values
set
(
CMAKE_SKIP_BUILD_RPATH FALSE
)
set
(
CMAKE_BUILD_WITH_INSTALL_RPATH TRUE
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE
)
set
(
CMAKE_INSTALL_RPATH
""
)
set
(
CMAKE_INSTALL_RPATH
"
${
Qt5_DIR
}
/../../"
)
set
(
CMAKE_EXE_LINKER_FLAGS
"
${
CMAKE_EXE_LINKER_FLAGS
}
-Wl,-rpath,'
${
Qt5_DIR
}
/../../'"
)
#
set(CMAKE_SKIP_BUILD_RPATH FALSE)
#
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
#
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
#
set(CMAKE_INSTALL_RPATH "")
#
set(CMAKE_INSTALL_RPATH "${Qt5_DIR}/../../")
#
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,'${Qt5_DIR}/../../'")
list
(
FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
isSystemDir
)
if
(
"
${
isSystemDir
}
"
STREQUAL
"-1"
)
set
(
CMAKE_INSTALL_RPATH
"
${
CMAKE_INSTALL_PREFIX
}
/lib"
)
...
...
@@ -23,12 +23,12 @@ set(KUMIR2_SDK_SCRIPTS_DIR "${KUMIR2_RESOURCES_DIR}/devel")
set
(
KUMIR2_SDK_CMAKE_DIR
"
${
KUMIR2_RESOURCES_DIR
}
/devel/cmake"
)
# Compile flags
set
(
KUMIR2_CXXFLAGS
"-fno-exceptions -std=c++0x -fPIC -DAPPLE"
)
set
(
KUMIR2_CXXFLAGS
"-fno-exceptions -std=c++0x -fPIC -DAPPLE
-Wno-inconsistent-missing-override
"
)
set
(
KUMIR2_CXXFLAGS_Release
"-O2 -DNDEBUG -DQT_NO_DEBUG"
)
set
(
KUMIR2_CXXFLAGS_Debug
"-g -O0 -Werror -Wreorder -Wreturn-type -Wno-error=unused-variable -Wno-error=unused-parameter"
)
# Linkage flags
set
(
KUMIR2_LIBRARY_LINKER_FLAGS
" -Wl,-rpath,'/'"
)
set
(
KUMIR2_PLUGIN_LINKER_FLAGS
" -Wl,-rpath,'../PlugIns'"
)
set
(
KUMIR2_LAUNCHER_LINKER_FLAGS
"-Wl,-rpath,'../PlugIns'"
)
set
(
KUMIR2_TOOL_LINKER_FLAGS
"-Wl,-rpath,'../PlugIns'"
)
#
set(KUMIR2_LIBRARY_LINKER_FLAGS " -Wl,-rpath,'/'")
#
set(KUMIR2_PLUGIN_LINKER_FLAGS " -Wl,-rpath,'../PlugIns'")
#
set(KUMIR2_LAUNCHER_LINKER_FLAGS "-Wl,-rpath,'../PlugIns'")
#
set(KUMIR2_TOOL_LINKER_FLAGS "-Wl,-rpath,'../PlugIns'")
src/app/CMakeLists.txt
View file @
85216863
find_package
(
Kumir2 REQUIRED
)
# find_package(Llvm)
# Various GUI configurations
if
(
NOT APPLE
)
# Various GUI configurations
add_opt_subdirectory
(
kumir2-classic
)
add_opt_subdirectory
(
kumir2-highgrade
)
add_opt_subdirectory
(
kumir2-ide
)
add_opt_subdirectory
(
kumir2-teacher
)
else
()
add_subdirectory
(
kumir2-macx
)
endif
(
NOT APPLE
)
add_opt_subdirectory
(
kumir2-classic
)
add_opt_subdirectory
(
kumir2-highgrade
)
add_opt_subdirectory
(
kumir2-ide
)
add_opt_subdirectory
(
kumir2-teacher
)
add_opt_subdirectory
(
kumir2-checkcourse
)
add_opt_subdirectory
(
kumir2-bc
)
add_opt_subdirectory
(
kumir2-xrun
)
...
...
src/app/kumir2-macx/CMakeLists.txt
View file @
85216863
...
...
@@ -4,7 +4,8 @@ cmake_minimum_required(VERSION 3.0)
find_package
(
Kumir2 REQUIRED
)
kumir2_add_launcher
(
NAME kumir2-teacher
SPLASHSCREEN
"coregui/splashscreens/professional.png"
NAME Kumir
SPLASHSCREEN
"splashscreen-macx.png"
WINDOW_ICON
"window-icon-macx.png"
CONFIGURATION
"CourseManager,Editor,Actor*,KumirAnalizer,KumirCodeGenerator,KumirCodeRun,!CoreGUI"
)
src/app/kumir2-macx/splashscreen-macx.png
0 → 100644
View file @
85216863
14.2 KB
src/app/kumir2-macx/window-icon-macx.png
0 → 100644
View file @
85216863
18.3 KB
src/plugins/coursemanager/coursemanager_plugin.cpp
View file @
85216863
...
...
@@ -627,7 +627,7 @@ QString Plugin::initialize(const QStringList &configurationArguments,
qDebug
()
<<
"Stream status"
<<
resultStream
.
status
();
}
else
{
resultStream
.
setStatus
(
QTextStream
::
WriteFailed
);
std
::
cout
<<
"Cant open output file:"
<<
runtimeArguments
.
value
(
'o'
).
toString
().
toLocal8Bit
().
data
()
<<
endl
;
//
std::cout <<"Cant open output file:" << runtimeArguments.value('o').toString().toLocal8Bit().data()<<endl;
}
}
return
""
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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