Browse Source

Updated cmake_minimum_required

merge-requests/181/head^2
eidheim 11 months ago
parent
commit
332bf8b627
  1. 2
      CMakeLists.txt
  2. 2
      lib/libclangmm
  3. 2
      lib/tiny-process-library
  4. 4
      src/window.cpp
  5. 2
      tests/lldb_test_files/CMakeLists.txt

2
CMakeLists.txt

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.10)
project(juci) project(juci)
set(JUCI_VERSION "1.8.0.2") set(JUCI_VERSION "1.8.0.2")

2
lib/libclangmm

@ -1 +1 @@
Subproject commit 88e64eb5bcc904604812dc9f380e001fd2a54aad Subproject commit 8dca5d81af05d5184da92a2ca2ce175b5577de25

2
lib/tiny-process-library

@ -1 +1 @@
Subproject commit 6166ba5dce461438cefb57e847832aca25d510d7 Subproject commit 8bbb5a211c5c9df8ee69301da9d22fb977b27dc1

4
src/window.cpp

@ -356,7 +356,7 @@ void Window::set_menu_actions() {
// Depending on default_build_management_system, generate build configuration // Depending on default_build_management_system, generate build configuration
if(Config::get().project.default_build_management_system == "cmake") { if(Config::get().project.default_build_management_system == "cmake") {
build_config_path = project_path / "CMakeLists.txt"; build_config_path = project_path / "CMakeLists.txt";
build_config = "cmake_minimum_required(VERSION 3.5)\n\nproject(" + project_name + ")\n\nset(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -std=c11 -Wall -Wextra\")\n\nadd_executable(" + project_name + " main.c)\n"; build_config = "cmake_minimum_required(VERSION 3.10)\n\nproject(" + project_name + ")\n\nset(CMAKE_C_FLAGS \"${CMAKE_C_FLAGS} -std=c11 -Wall -Wextra\")\n\nadd_executable(" + project_name + " main.c)\n";
} }
else if(Config::get().project.default_build_management_system == "meson") { else if(Config::get().project.default_build_management_system == "meson") {
build_config_path = project_path / "meson.build"; build_config_path = project_path / "meson.build";
@ -413,7 +413,7 @@ void Window::set_menu_actions() {
// Depending on default_build_management_system, generate build configuration // Depending on default_build_management_system, generate build configuration
if(Config::get().project.default_build_management_system == "cmake") { if(Config::get().project.default_build_management_system == "cmake") {
build_config_path = project_path / "CMakeLists.txt"; build_config_path = project_path / "CMakeLists.txt";
build_config = "cmake_minimum_required(VERSION 3.5)\n\nproject(" + project_name + ")\n\nset(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -std=c++1y -Wall -Wextra\")\n\nadd_executable(" + project_name + " main.cpp)\n"; build_config = "cmake_minimum_required(VERSION 3.10)\n\nproject(" + project_name + ")\n\nset(CMAKE_CXX_FLAGS \"${CMAKE_CXX_FLAGS} -std=c++1y -Wall -Wextra\")\n\nadd_executable(" + project_name + " main.cpp)\n";
} }
else if(Config::get().project.default_build_management_system == "meson") { else if(Config::get().project.default_build_management_system == "meson") {
build_config_path = project_path / "meson.build"; build_config_path = project_path / "meson.build";

2
tests/lldb_test_files/CMakeLists.txt

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.10)
add_compile_options(-O0 -g -Wno-unused-but-set-variable) add_compile_options(-O0 -g -Wno-unused-but-set-variable)

Loading…
Cancel
Save