review folders

gammasoft71 · Oct 24, 2019 · 8130788 · 8130788
1 parent 7ca9f7a
commit 8130788
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 7 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "xtd.tunit"]
-	path = xtd_tunit
+[submodule "src/xtd_tunit"]
+	path = src/xtd_tunit
 	url = https://github.com/gammasoft71/xtd_tunit
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,9 @@ project(xtd.io)
 
 # Options
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set(IS_MAIN_PROJECT OFF)
 if (NOT DEFINED EXPORT_PROJECT_NAME)
+  set(IS_MAIN_PROJECT ON)
   set(EXPORT_PROJECT_NAME ${PROJECT_NAME})
 endif ()
 
@@ -17,10 +19,7 @@ if (ENABLE_COVERAGE AND UNIX)
 endif ()
 
 # Projects
-add_subdirectory(xtd.io)
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
-  add_subdirectory(xtd.tunit)
-endif ()
+add_subdirectory(src)
 
 # Tests projects
 option(ENABLE_TESTS "Enable tests" OFF)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.3)
+
+# Solution
+project(src)
+
+# Projects
+add_subdirectory(xtd_io)
+if (IS_MAIN_PROJECT)
+  add_subdirectory(xtd_tunit)
+endif ()
diff --git a/xtd.io/CMakeLists.txt → src/xtd_io/CMakeLists.txt b/xtd.io/CMakeLists.txt → src/xtd_io/CMakeLists.txt
diff --git a/xtd.io/include/xtd/cnull.hpp → src/xtd_io/include/xtd/cnull.hpp b/xtd.io/include/xtd/cnull.hpp → src/xtd_io/include/xtd/cnull.hpp
diff --git a/xtd.io/include/xtd/file.hpp → src/xtd_io/include/xtd/file.hpp b/xtd.io/include/xtd/file.hpp → src/xtd_io/include/xtd/file.hpp
diff --git a/xtd.io/include/xtd/file_attributes.hpp → src/xtd_io/include/xtd/file_attributes.hpp b/xtd.io/include/xtd/file_attributes.hpp → src/xtd_io/include/xtd/file_attributes.hpp
diff --git a/xtd.io/include/xtd/path.hpp → src/xtd_io/include/xtd/path.hpp b/xtd.io/include/xtd/path.hpp → src/xtd_io/include/xtd/path.hpp
diff --git a/xtd.io/include/xtd/xtd.io → src/xtd_io/include/xtd/xtd.io b/xtd.io/include/xtd/xtd.io → src/xtd_io/include/xtd/xtd.io
diff --git a/xtd.io/include/xtd/xtd.io.hpp → src/xtd_io/include/xtd/xtd.io.hpp b/xtd.io/include/xtd/xtd.io.hpp → src/xtd_io/include/xtd/xtd.io.hpp
diff --git a/xtd.io/src/file_gcc.cpp → src/xtd_io/src/file_gcc.cpp b/xtd.io/src/file_gcc.cpp → src/xtd_io/src/file_gcc.cpp
diff --git a/xtd.io/src/file_win32.cpp → src/xtd_io/src/file_win32.cpp b/xtd.io/src/file_win32.cpp → src/xtd_io/src/file_win32.cpp
diff --git a/xtd.io/src/path_gcc.cpp → src/xtd_io/src/path_gcc.cpp b/xtd.io/src/path_gcc.cpp → src/xtd_io/src/path_gcc.cpp
diff --git a/xtd.io/src/path_win32.cpp → src/xtd_io/src/path_win32.cpp b/xtd.io/src/path_win32.cpp → src/xtd_io/src/path_win32.cpp
diff --git a/src/xtd_tunit b/src/xtd_tunit
diff --git a/xtd.tunit b/xtd.tunit