Skip to content

Commit

Permalink
Added SimpleOverride as submodule and updated other modules
Browse files Browse the repository at this point in the history
  • Loading branch information
Neko-Box-Coder committed May 31, 2023
1 parent b3410fa commit 3c1f50e
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@
[submodule "External/Embed2C"]
path = External/Embed2C
url = https://github.com/Neko-Box-Coder/Embed2C.git
[submodule "External/SimpleOverride"]
path = External/SimpleOverride
url = https://github.com/Neko-Box-Coder/SimpleOverride.git
15 changes: 15 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 3.14)
# cmake_minimum_required(VERSION 3.24)

if(TARGET ssGUI)
return()
endif()

set (CMAKE_CXX_STANDARD 11)

# For Clang to do parsing
Expand Down Expand Up @@ -164,6 +168,16 @@ set(ssTEST_BUILD_CHECK OFF)
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/ssTest" "${CMAKE_CURRENT_BINARY_DIR}/ssTest")
set_target_properties(ssTest PROPERTIES FOLDER External) # Set folder name for IDEs such as Visual Studio


# ==========================================================
# SimpleOverride
# ==========================================================

if(NOT ssGUI_MOCK_BACKEND_MODE STREQUAL "${ssGUI_MOCK_OFF_OPTION_STRING}")
add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/External/SimpleOverride" "${CMAKE_CURRENT_BINARY_DIR}/SimpleOverride")
set_target_properties(SimpleOverride PROPERTIES FOLDER External) # Set folder name for IDEs such as Visual Studio
endif()

if(NOT ssGUI_MOCK_BACKEND_MODE STREQUAL "${ssGUI_MOCK_OPTION_STRING}")
# ==========================================================
# clip
Expand Down Expand Up @@ -376,6 +390,7 @@ if(NOT ssGUI_MOCK_BACKEND_MODE STREQUAL "${ssGUI_MOCK_OPTION_STRING}")
endif()

if(NOT ssGUI_MOCK_BACKEND_MODE STREQUAL "${ssGUI_MOCK_OFF_OPTION_STRING}")
target_link_libraries(ssGUI PUBLIC SimpleOverride)
target_compile_definitions(ssGUI PUBLIC SSGUI_MOCK_BACKEND)
endif()

Expand Down
1 change: 1 addition & 0 deletions External/SimpleOverride
Submodule SimpleOverride added at 98f62e
2 changes: 1 addition & 1 deletion External/clip
2 changes: 1 addition & 1 deletion External/ssLogger
Submodule ssLogger updated 1 files
+4 −0 CMakeLists.txt
2 changes: 1 addition & 1 deletion External/ssTest
Submodule ssTest updated 1 files
+4 −0 CMakeLists.txt

0 comments on commit 3c1f50e

Please sign in to comment.