Make it work

jasp-stats · Mar 1, 2024 · 94e4f27 · 94e4f27
1 parent 77cff89
commit 94e4f27
Show file tree

Hide file tree

Showing 392 changed files with 308 additions and 44,636 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -142,3 +142,9 @@
 [submodule "Modules/jaspSurvival"]
 	path = Modules/jaspSurvival
 	url = https://github.com/jasp-stats/jaspSurvival
+[submodule "jaspCommonLib"]
+	path = jaspCommonLib
+	url = https://github.com/jasp-stats/jaspCommonLib
+[submodule "jaspQMLControlsPlugin"]
+	path = jaspQMLControlsPlugin
+	url = https://github.com/jasp-stats/jaspQMLControlsPlugin
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,9 +123,9 @@ if(WIN32)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 endif()
 
-add_subdirectory(Common)
+add_subdirectory(jaspCommonLib)
 add_subdirectory(CommonData)
-add_subdirectory(QMLComponents)
+add_subdirectory(jaspQMLControlsPlugin)
 
 if(NOT WIN32)
   add_subdirectory(R-Interface)

diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
diff --git a/Common/QtUtils/appdirs.cpp b/Common/QtUtils/appdirs.cpp