From 8e5577bf37c38e9112cbcc49ccede1e655be52ba Mon Sep 17 00:00:00 2001 From: Silas Dohm <silas.dohm@stud.hs-bochum.de> Date: Fri, 19 Aug 2022 16:24:37 +0200 Subject: [PATCH] spelling --- CMakeLists.txt | 18 ++-- Makefile | 276 ------------------------------------------------- 2 files changed, 9 insertions(+), 285 deletions(-) delete mode 100644 Makefile diff --git a/CMakeLists.txt b/CMakeLists.txt index a79596c..3353a94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(sodoku_solver VERSION 0.1 LANGUAGES CXX) +project(sudoku_solver VERSION 0.1 LANGUAGES CXX) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -24,37 +24,37 @@ set(PROJECT_SOURCES ) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) - qt_add_executable(sodoku_solver + qt_add_executable(sudoku_solver MANUAL_FINALIZATION ${PROJECT_SOURCES} ) # Define target properties for Android with Qt 6 as: -# set_property(TARGET sodoku_solver APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR +# set_property(TARGET sudoku_solver APPEND PROPERTY QT_ANDROID_PACKAGE_SOURCE_DIR # ${CMAKE_CURRENT_SOURCE_DIR}/android) # For more information, see https://doc.qt.io/qt-6/qt-add-executable.html#target-creation else() if(ANDROID) - add_library(sodoku_solver SHARED + add_library(sudoku_solver SHARED ${PROJECT_SOURCES} ) # Define properties for Android with Qt 5 after find_package() calls as: # set(ANDROID_PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/android") else() - add_executable(sodoku_solver + add_executable(sudoku_solver ${PROJECT_SOURCES} ) endif() endif() -target_link_libraries(sodoku_solver PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) -target_link_libraries(sodoku_solver PRIVATE Qt${QT_VERSION_MAJOR}::Concurrent) +target_link_libraries(sudoku_solver PRIVATE Qt${QT_VERSION_MAJOR}::Widgets) +target_link_libraries(sudoku_solver PRIVATE Qt${QT_VERSION_MAJOR}::Concurrent) -set_target_properties(sodoku_solver PROPERTIES +set_target_properties(sudoku_solver PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER my.example.com MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION} MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR} ) if(QT_VERSION_MAJOR EQUAL 6) - qt_finalize_executable(sodoku_solver) + qt_finalize_executable(sudoku_solver) endif() diff --git a/Makefile b/Makefile deleted file mode 100644 index 40c0c84..0000000 --- a/Makefile +++ /dev/null @@ -1,276 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.22 - -# Default target executed when no arguments are given to make. -default_target: all -.PHONY : default_target - -# Allow only one "make -f Makefile2" at a time, but pass parallelism. -.NOTPARALLEL: - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - -# Disable VCS-based implicit rules. -% : %,v - -# Disable VCS-based implicit rules. -% : RCS/% - -# Disable VCS-based implicit rules. -% : RCS/%,v - -# Disable VCS-based implicit rules. -% : SCCS/s.% - -# Disable VCS-based implicit rules. -% : s.% - -.SUFFIXES: .hpux_make_needs_suffix_list - -# Command-line flag to silence nested $(MAKE). -$(VERBOSE)MAKESILENT = -s - -#Suppress display of executed commands. -$(VERBOSE).SILENT: - -# A target that is always out of date. -cmake_force: -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E rm -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/sls/Documents/dev/soduoku_solver - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/sls/Documents/dev/soduoku_solver - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "No interactive CMake dialog available..." - /usr/bin/cmake -E echo No\ interactive\ CMake\ dialog\ available. -.PHONY : edit_cache - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache -.PHONY : edit_cache/fast - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache -.PHONY : rebuild_cache/fast - -# The main all target -all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /home/sls/Documents/dev/soduoku_solver/CMakeFiles /home/sls/Documents/dev/soduoku_solver//CMakeFiles/progress.marks - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /home/sls/Documents/dev/soduoku_solver/CMakeFiles 0 -.PHONY : all - -# The main clean target -clean: - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 clean -.PHONY : clean - -# The main clean target -clean/fast: clean -.PHONY : clean/fast - -# Prepare targets for installation. -preinstall: all - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall - -# Prepare targets for installation. -preinstall/fast: - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 preinstall -.PHONY : preinstall/fast - -# clear depends -depend: - $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -.PHONY : depend - -#============================================================================= -# Target rules for targets named sodoku_solver - -# Build rule for target. -sodoku_solver: cmake_check_build_system - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 sodoku_solver -.PHONY : sodoku_solver - -# fast build rule for target. -sodoku_solver/fast: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/build -.PHONY : sodoku_solver/fast - -#============================================================================= -# Target rules for targets named sodoku_solver_autogen - -# Build rule for target. -sodoku_solver_autogen: cmake_check_build_system - $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 sodoku_solver_autogen -.PHONY : sodoku_solver_autogen - -# fast build rule for target. -sodoku_solver_autogen/fast: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver_autogen.dir/build.make CMakeFiles/sodoku_solver_autogen.dir/build -.PHONY : sodoku_solver_autogen/fast - -cell.o: cell.cpp.o -.PHONY : cell.o - -# target to build an object file -cell.cpp.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/cell.cpp.o -.PHONY : cell.cpp.o - -cell.i: cell.cpp.i -.PHONY : cell.i - -# target to preprocess a source file -cell.cpp.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/cell.cpp.i -.PHONY : cell.cpp.i - -cell.s: cell.cpp.s -.PHONY : cell.s - -# target to generate assembly for a file -cell.cpp.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/cell.cpp.s -.PHONY : cell.cpp.s - -main.o: main.cpp.o -.PHONY : main.o - -# target to build an object file -main.cpp.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/main.cpp.o -.PHONY : main.cpp.o - -main.i: main.cpp.i -.PHONY : main.i - -# target to preprocess a source file -main.cpp.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/main.cpp.i -.PHONY : main.cpp.i - -main.s: main.cpp.s -.PHONY : main.s - -# target to generate assembly for a file -main.cpp.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/main.cpp.s -.PHONY : main.cpp.s - -sodoku_solver_autogen/mocs_compilation.o: sodoku_solver_autogen/mocs_compilation.cpp.o -.PHONY : sodoku_solver_autogen/mocs_compilation.o - -# target to build an object file -sodoku_solver_autogen/mocs_compilation.cpp.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/sodoku_solver_autogen/mocs_compilation.cpp.o -.PHONY : sodoku_solver_autogen/mocs_compilation.cpp.o - -sodoku_solver_autogen/mocs_compilation.i: sodoku_solver_autogen/mocs_compilation.cpp.i -.PHONY : sodoku_solver_autogen/mocs_compilation.i - -# target to preprocess a source file -sodoku_solver_autogen/mocs_compilation.cpp.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/sodoku_solver_autogen/mocs_compilation.cpp.i -.PHONY : sodoku_solver_autogen/mocs_compilation.cpp.i - -sodoku_solver_autogen/mocs_compilation.s: sodoku_solver_autogen/mocs_compilation.cpp.s -.PHONY : sodoku_solver_autogen/mocs_compilation.s - -# target to generate assembly for a file -sodoku_solver_autogen/mocs_compilation.cpp.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/sodoku_solver_autogen/mocs_compilation.cpp.s -.PHONY : sodoku_solver_autogen/mocs_compilation.cpp.s - -window.o: window.cpp.o -.PHONY : window.o - -# target to build an object file -window.cpp.o: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/window.cpp.o -.PHONY : window.cpp.o - -window.i: window.cpp.i -.PHONY : window.i - -# target to preprocess a source file -window.cpp.i: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/window.cpp.i -.PHONY : window.cpp.i - -window.s: window.cpp.s -.PHONY : window.s - -# target to generate assembly for a file -window.cpp.s: - $(MAKE) $(MAKESILENT) -f CMakeFiles/sodoku_solver.dir/build.make CMakeFiles/sodoku_solver.dir/window.cpp.s -.PHONY : window.cpp.s - -# Help Target -help: - @echo "The following are some of the valid targets for this Makefile:" - @echo "... all (the default if no target is provided)" - @echo "... clean" - @echo "... depend" - @echo "... edit_cache" - @echo "... rebuild_cache" - @echo "... sodoku_solver_autogen" - @echo "... sodoku_solver" - @echo "... cell.o" - @echo "... cell.i" - @echo "... cell.s" - @echo "... main.o" - @echo "... main.i" - @echo "... main.s" - @echo "... sodoku_solver_autogen/mocs_compilation.o" - @echo "... sodoku_solver_autogen/mocs_compilation.i" - @echo "... sodoku_solver_autogen/mocs_compilation.s" - @echo "... window.o" - @echo "... window.i" - @echo "... window.s" -.PHONY : help - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system - -- GitLab