diff --git a/cmake/kumir2/kumir2_apple.cmake b/cmake/kumir2/kumir2_apple.cmake index ac961830859e71a8db4d18c0d84edd039c572609..a5accdb3ad2e42bc02a310af6dcd23c0e2bae004 100644 --- a/cmake/kumir2/kumir2_apple.cmake +++ b/cmake/kumir2/kumir2_apple.cmake @@ -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'") diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 7e5c1b66e8a2125afe25493599a6b680c4e3c088..883b52681b4c70774e6571515b15a854a38754a3 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -1,15 +1,17 @@ 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) diff --git a/src/app/kumir2-macx/CMakeLists.txt b/src/app/kumir2-macx/CMakeLists.txt index 259687b4dfe44e02b79186d91c56e16ce649c9a5..89a8b07031b89941909f3aa00a8e7ffd37e989e7 100644 --- a/src/app/kumir2-macx/CMakeLists.txt +++ b/src/app/kumir2-macx/CMakeLists.txt @@ -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" ) diff --git a/src/app/kumir2-macx/splashscreen-macx.png b/src/app/kumir2-macx/splashscreen-macx.png new file mode 100644 index 0000000000000000000000000000000000000000..f3ea60ae725321e95f4fb2a0005e061f1e5b5f71 Binary files /dev/null and b/src/app/kumir2-macx/splashscreen-macx.png differ diff --git a/src/app/kumir2-macx/window-icon-macx.png b/src/app/kumir2-macx/window-icon-macx.png new file mode 100644 index 0000000000000000000000000000000000000000..00b9cddcbf7826c25b8eaa22ccd6f2e46814a717 Binary files /dev/null and b/src/app/kumir2-macx/window-icon-macx.png differ diff --git a/src/plugins/coursemanager/coursemanager_plugin.cpp b/src/plugins/coursemanager/coursemanager_plugin.cpp index 014568710dca3785d976b0fe61ff241f1dc42a8c..e12225863d6e9309948c4562e1dedc10d61320ed 100644 --- a/src/plugins/coursemanager/coursemanager_plugin.cpp +++ b/src/plugins/coursemanager/coursemanager_plugin.cpp @@ -627,7 +627,7 @@ QString Plugin::initialize(const QStringList &configurationArguments, qDebug()<<"Stream status"<