Skip to content

Commit

Permalink
Moved submodules to extlibs
Browse files Browse the repository at this point in the history
  • Loading branch information
pinam45 committed Apr 2, 2019
1 parent 9ede091 commit cbb338f
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 22 deletions.
14 changes: 7 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
[submodule "deps/SFML"]
path = deps/SFML
path = extlibs/SFML
url = https://github.com/SFML/SFML
[submodule "deps/imgui"]
path = deps/imgui
path = extlibs/imgui
url = https://github.com/ocornut/imgui/
[submodule "deps/imgui-sfml"]
path = deps/imgui-sfml
path = extlibs/imgui-sfml
url = https://github.com/eliasdaler/imgui-sfml
[submodule "deps/spdlog"]
path = deps/spdlog
path = extlibs/spdlog
url = https://github.com/gabime/spdlog
[submodule "deps/utfcpp"]
path = deps/utfcpp
path = extlibs/utfcpp
url = https://github.com/nemtrif/utfcpp
[submodule "deps/taglib"]
path = deps/taglib
path = extlibs/taglib
url = https://github.com/taglib/taglib
[submodule "deps/json"]
path = deps/json
path = extlibs/json
url = https://github.com/nlohmann/json
[submodule "cmake/CMutils"]
path = cmake/CMutils
Expand Down
2 changes: 1 addition & 1 deletion cmake/IconFontCppHeaders.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ target_include_directories(
# Headers target for ide
cmutils_interface_target_generate_headers_target(IconFontCppHeaders IconFontCppHeaders_headers_for_ide)
cmutils_target_source_group(IconFontCppHeaders_headers_for_ide "${ICON_FONT_CPP_HEADERS_DIR}")
cmutils_target_set_ide_folder(IconFontCppHeaders_headers_for_ide "deps/IconFontCppHeaders")
cmutils_target_set_ide_folder(IconFontCppHeaders_headers_for_ide "extlibs/IconFontCppHeaders")

message(STATUS "Configuring IconFontCppHeaders - Done")
4 changes: 2 additions & 2 deletions cmake/SFML.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ if(NOT SFML_USE_EMBEDED)
endif()

if(SFML_USE_EMBEDED)
get_filename_component(SFML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/SFML ABSOLUTE)
get_filename_component(SFML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/SFML ABSOLUTE)

# Submodule check
cmutils_directory_is_empty(is_empty "${SFML_DIR}")
Expand All @@ -43,7 +43,7 @@ if(SFML_USE_EMBEDED)
foreach(sfml_target IN ITEMS sfml-system sfml-network sfml-window sfml-graphics sfml-audio sfml-main)
if(TARGET ${sfml_target})
# Configure SFML folder in IDE
cmutils_target_set_ide_folder(${sfml_target} "deps/SFML")
cmutils_target_set_ide_folder(${sfml_target} "extlibs/SFML")

# Disable warnings on headers
get_target_property(target_include_directories ${sfml_target} INTERFACE_INCLUDE_DIRECTORIES)
Expand Down
6 changes: 3 additions & 3 deletions cmake/imgui-sfml.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
message(STATUS "Configuring imgui-sfml")

get_filename_component(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/imgui ABSOLUTE)
get_filename_component(IMGUI_SFML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/imgui-sfml ABSOLUTE)
get_filename_component(IMGUI_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/imgui ABSOLUTE)
get_filename_component(IMGUI_SFML_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/imgui-sfml ABSOLUTE)
get_filename_component(IMGUI_SFML_TARGET_DIR ${CMAKE_CURRENT_BINARY_DIR}/imgui-sfml ABSOLUTE)

# Submodules check
Expand Down Expand Up @@ -81,7 +81,7 @@ cmutils_target_set_standard(imgui-sfml CXX 17)
cmutils_target_set_runtime(imgui-sfml DYNAMIC)

# Set target IDE folder
cmutils_target_set_ide_folder(imgui-sfml "deps/generated/imgui-sfml")
cmutils_target_set_ide_folder(imgui-sfml "extlibs/generated/imgui-sfml")

# Group sources for IDEs
cmutils_target_source_group(imgui-sfml "${IMGUI_SFML_TARGET_DIR}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/json.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
message(STATUS "Configuring json")

get_filename_component(JSON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/json ABSOLUTE)
get_filename_component(JSON_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/json ABSOLUTE)

# Submodule check
cmutils_directory_is_empty(is_empty "${JSON_DIR}")
Expand Down
4 changes: 2 additions & 2 deletions cmake/spdlog.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
message(STATUS "Configuring spdlog")

get_filename_component(SPDLOG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/spdlog ABSOLUTE)
get_filename_component(SPDLOG_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/spdlog ABSOLUTE)

# Submodule check
cmutils_directory_is_empty(is_empty "${SPDLOG_DIR}")
Expand All @@ -21,7 +21,7 @@ target_include_directories(spdlog SYSTEM INTERFACE ${spdlog_include_directories}

if(TARGET spdlog_headers_for_ide)
# Set target IDE folder
cmutils_target_set_ide_folder(spdlog_headers_for_ide "deps/spdlog")
cmutils_target_set_ide_folder(spdlog_headers_for_ide "extlibs/spdlog")
endif()

message(STATUS "Configuring spdlog - Done")
10 changes: 5 additions & 5 deletions cmake/taglib.cmake
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
message(STATUS "Configuring taglib")

get_filename_component(TAGLIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps/taglib" ABSOLUTE)
get_filename_component(TAGLIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/extlibs/taglib" ABSOLUTE)
get_filename_component(TAGLIB_SRC_DIR "${TAGLIB_DIR}/taglib" ABSOLUTE)
get_filename_component(TAGLIB_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/deps/taglib/config" ABSOLUTE)
get_filename_component(TAGLIB_IMPORTED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/deps/taglib/include" ABSOLUTE)
get_filename_component(TAGLIB_CONFIG_DIR "${CMAKE_CURRENT_BINARY_DIR}/extlibs/taglib/config" ABSOLUTE)
get_filename_component(TAGLIB_IMPORTED_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/extlibs/taglib/include" ABSOLUTE)

# Submodule check
cmutils_directory_is_empty(is_empty "${TAGLIB_DIR}")
Expand Down Expand Up @@ -72,7 +72,7 @@ cmutils_target_set_standard(tag CXX 11)
cmutils_target_set_runtime(tag DYNAMIC)

# Set target IDE folder
cmutils_target_set_ide_folder(tag "deps/taglib")
cmutils_target_set_ide_folder(tag "extlibs/taglib")

# Group sources for IDEs
cmutils_target_source_group(tag "${TAGLIB_SRC_DIR}")
Expand All @@ -98,6 +98,6 @@ target_include_directories(
# Headers target for ide
cmutils_interface_target_generate_headers_target(taglib taglib_headers_for_ide)
cmutils_target_source_group(taglib_headers_for_ide "${TAGLIB_IMPORTED_INCLUDE_DIR}")
cmutils_target_set_ide_folder(taglib_headers_for_ide "deps/generated/taglib")
cmutils_target_set_ide_folder(taglib_headers_for_ide "extlibs/generated/taglib")

message(STATUS "Configuring taglib - Done")
2 changes: 1 addition & 1 deletion cmake/utfcpp.cmake
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
message(STATUS "Configuring utfcpp")

get_filename_component(UTFCPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/deps/utfcpp ABSOLUTE)
get_filename_component(UTFCPP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/extlibs/utfcpp ABSOLUTE)

# Submodule check
cmutils_directory_is_empty(is_empty "${UTFCPP_DIR}")
Expand Down
Submodule SFML updated from 000000 to 95c967
Submodule json updated from 000000 to 676c84

0 comments on commit cbb338f

Please sign in to comment.