Merge pull request #3 from IgorKilipenko/dev/v1.0.1

IgorKilipenko · May 14, 2024 · 3302c8c · 3302c8c
2 parents 39e767f + b394710
commit 3302c8c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
     "cmake.configureSettings": {
-        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_BUILD_TYPE": "Debug"
     },
     "[cpp]": {
         "editor.suggestSelection": "recentlyUsedByPrefix",
@@ -13,5 +13,6 @@
     "cSpell.words": [
         "antlr",
         "apostroph"
-    ]
+    ],
+    "cmake.options.statusBarVisibility": "compact"
 }
diff --git a/spreadsheet/CMakeLists.txt b/spreadsheet/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.8 FATAL_ERROR)
 project(spreadsheet)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 17)
 if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     set(
         CMAKE_CXX_FLAGS_DEBUG
@@ -38,21 +38,32 @@ file(GLOB sources
     *.h
 )
 
+set(sources_lib ${sources})
+
+list(FILTER sources_lib EXCLUDE REGEX ".*main\\.cpp$")
+
+add_library(
+    libspreadsheet
+    ${ANTLR_FormulaParser_CXX_OUTPUTS}
+    ${sources_lib}
+)
+
 add_executable(
     spreadsheet
-    ${ANTLR_FormulaParser_CXX_OUTPUTS}
-    ${sources}
+    main.cpp
 )
 
-target_link_libraries(spreadsheet antlr4_static)
+target_link_libraries(libspreadsheet antlr4_static)
 if(MSVC)
     target_compile_options(antlr4_static PRIVATE /W0)
 endif()
 
+target_link_libraries(spreadsheet PRIVATE libspreadsheet)
+
 install(
     TARGETS spreadsheet
     DESTINATION bin
-    EXPORT spreadsheet
+    EXPORT libspreadsheet
 )
 
 set_directory_properties(PROPERTIES VS_STARTUP_PROJECT spreadsheet)