head5man · head5man · Mar 3, 2025 · Mar 3, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -7,4 +7,4 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/example)
 
 enable_testing()
 
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/test)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/lib/tests)
diff --git a/cmake/argsparse-lib.cmake b/cmake/argsparse-lib.cmake
@@ -2,13 +2,16 @@
 include(${CMAKE_CURRENT_LIST_DIR}/../cmake/getopt.cmake)
 
 # Main source directory
-include_directories(${CMAKE_CURRENT_LIST_DIR}/.. $ENV{EXTRA_INCLUDES})
+include_directories(
+    ${CMAKE_CURRENT_LIST_DIR}/../include
+    ${CMAKE_CURRENT_LIST_DIR}/../lib/inc
+    $ENV{EXTRA_INCLUDES})
 
 list(APPEND SourceFiles
-    ${CMAKE_CURRENT_LIST_DIR}/../argsparse.c
-    ${CMAKE_CURRENT_LIST_DIR}/../internal_funcs.c
+    ${CMAKE_CURRENT_LIST_DIR}/../lib/src/argsparse.c
+    ${CMAKE_CURRENT_LIST_DIR}/../lib/src/internal_funcs.c
 )
 
 add_library(${PROJECT_NAME}-lib ${SourceFiles})
 
-target_include_directories(${PROJECT_NAME}-lib PUBLIC ${CMAKE_CURRENT_LIST_DIR}/..)
+target_include_directories(${PROJECT_NAME}-lib PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../include)
diff --git a/argsparse.h → include/argsparse.h b/argsparse.h → include/argsparse.h
diff --git a/internal_funcs.h → lib/inc/internal_funcs.h b/internal_funcs.h → lib/inc/internal_funcs.h
diff --git a/internal_types.h → lib/inc/internal_types.h b/internal_types.h → lib/inc/internal_types.h
diff --git a/iterate.h → lib/inc/iterate.h b/iterate.h → lib/inc/iterate.h
diff --git a/argsparse.c → lib/src/argsparse.c b/argsparse.c → lib/src/argsparse.c
diff --git a/internal_funcs.c → lib/src/internal_funcs.c b/internal_funcs.c → lib/src/internal_funcs.c
diff --git a/test/CMakeLists.txt → lib/tests/CMakeLists.txt b/test/CMakeLists.txt → lib/tests/CMakeLists.txt
@@ -5,10 +5,10 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
-include(${CMAKE_CURRENT_LIST_DIR}/../cmake/googletest.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../../cmake/googletest.cmake)
 
 # Main source directory
-include_directories(${CMAKE_CURRENT_LIST_DIR}/..)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../../include)
 
 list(APPEND SourceFiles
     ${CMAKE_CURRENT_LIST_DIR}/TestMain.cpp

diff --git a/test/TestMain.cpp → lib/tests/TestMain.cpp b/test/TestMain.cpp → lib/tests/TestMain.cpp
diff --git a/test/argsparseTests.cpp → lib/tests/argsparseTests.cpp b/test/argsparseTests.cpp → lib/tests/argsparseTests.cpp
diff --git a/test/tokenize.c → lib/tests/tokenize.c b/test/tokenize.c → lib/tests/tokenize.c
diff --git a/test/tokenize.h → lib/tests/tokenize.h b/test/tokenize.h → lib/tests/tokenize.h
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/example)

		enable_testing()

		add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/test)
		add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/lib/tests)