Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake: add folders #24

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

CMake: add folders #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.19)

project(Flame LANGUAGES CXX C)

Expand Down Expand Up @@ -36,6 +36,7 @@ flame_resolver_settings(
CMAKE_PACKAGING # ON
INPLACE_OBJECTS # ON
SHOW_HEADERS # ON
ENABLE_FOLDER # ON

# Code generation options
ONLY_POSITION_INDEPENDENT_OBJECTS # ON
Expand All @@ -62,4 +63,4 @@ endif()

add_subdirectory(${FLAME_INCLUDE_SUBMODLUES_PATH})
add_subdirectory(${FLAME_SOURCE_SUBMODLUES_PATH})
add_subdirectory(${FLAME_TEST_SUBMODLUES_PATH})
# add_subdirectory(${FLAME_TEST_SUBMODLUES_PATH})
2 changes: 1 addition & 1 deletion cmake/FlameContrib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function(download_resolver)
set(RESOLVER_NAME CMakeFlameResolver)
set(RESOLVER_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/${RESOLVER_NAME})
set(RESOLVER_URL "https://github.com/kachsheev/${RESOLVER_NAME}.git")
set(RESOLVER_VERSION "master")
set(RESOLVER_VERSION "feature/folder-support")
if(NOT (EXISTS "${RESOLVER_PATH}" AND IS_DIRECTORY "${RESOLVER_PATH}"))
execute_process(
COMMAND
Expand Down
2 changes: 2 additions & 0 deletions include/FlameIDE/About/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.14)

set(NAME About)
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::About::Headers)

get_sources(FILE_LIST)
Expand All @@ -9,5 +10,6 @@ flame_header_library(
HEADER_LIST "${FILE_LIST}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
FOLDER "${MODULE_NAME}"
INSTALL_SUBDIR "${FLAME_NAMESPACE}/${NAME}"
)
2 changes: 2 additions & 0 deletions include/FlameIDE/Bus/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.14)

set(NAME Bus)
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::Bus::Headers)
set(DEPENDENCY_LIST
${FLAME_NAMESPACE}::Templates::Headers
Expand All @@ -11,6 +12,7 @@ flame_header_library(
NAME "${NAME}"
HEADER_LIST "${FILE_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
FOLDER "${MODULE_NAME}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
INSTALL_SUBDIR "${FLAME_NAMESPACE}/${NAME}"
Expand Down
2 changes: 2 additions & 0 deletions include/FlameIDE/Common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.14)

set(NAME Common)
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::Common::Headers)
set(DEPENDENCY_LIST
${FLAME_NAMESPACE}::Common::Macros::Headers
Expand All @@ -12,6 +13,7 @@ flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
HEADER_LIST "${FILE_LIST}"
FOLDER "${MODULE_NAME}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
INSTALL_SUBDIR "${FLAME_NAMESPACE}/${NAME}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Common/Macros/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
INSTALL_SUBDIR "${FLAME_NAMESPACE}/Common/Macros"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Common/Traits/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
2 changes: 2 additions & 0 deletions include/FlameIDE/Constants/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
cmake_minimum_required(VERSION 3.14)

set(NAME Constants)
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::Constants::Headers)

get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
INSTALL_SUBDIR "${FLAME_NAMESPACE}/${NAME}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Crypto/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
cmake_minimum_required(VERSION 3.14)

set(MODULE_NAME Crypto)
set(HEADER_MODULES
${CMAKE_CURRENT_LIST_DIR}/Oasis
${CMAKE_CURRENT_LIST_DIR}/Pkcs11
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Crypto/Oasis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
INSTALL_SUBDIR "${FLAME_NAMESPACE}/Crypto/pkcs11"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Crypto/Pkcs11/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Crypto/Pkcs11/Types/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Crypto/Pkcs11/Types/Structs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Os/Async/Network/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
2 changes: 2 additions & 0 deletions include/FlameIDE/Os/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.14)

set(NAME "Os")
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::Os::Headers)
set(DEPENDENCY_LIST
${FLAME_NAMESPACE}::Common::Macros::Headers
Expand All @@ -14,6 +15,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Os/Network/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Os/Posix/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Os/Threads/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Os/Windows/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
2 changes: 2 additions & 0 deletions include/FlameIDE/Others/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
cmake_minimum_required(VERSION 3.14)

set(NAME Others)
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::Others::Headers)

get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
INSTALL_SUBDIR "${FLAME_NAMESPACE}/${NAME}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Templates/Allocator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
2 changes: 2 additions & 0 deletions include/FlameIDE/Templates/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.14)

set(NAME Templates)
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::Templates::Headers)
set(DEPENDENCY_LIST
${FLAME_NAMESPACE}::Templates::Allocator::Headers
Expand All @@ -12,6 +13,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Templates/Iterator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
1 change: 1 addition & 0 deletions include/FlameIDE/Templates/Serialization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
2 changes: 2 additions & 0 deletions include/FlameIDE/Ubjson/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
cmake_minimum_required(VERSION 3.14)

set(NAME Ubjson)
set(MODULE_NAME ${NAME})
set(LIBRARY_ALIAS_NAME ${FLAME_NAMESPACE}::Ubjson::Headers)
set(DEPENDENCY_LIST
${FLAME_NAMESPACE}::Templates::Headers
Expand All @@ -10,6 +11,7 @@ get_sources(FILE_LIST)
flame_header_library(
NAME "${NAME}"
LIBRARY_ALIAS_NAME "${LIBRARY_ALIAS_NAME}"
FOLDER "${MODULE_NAME}"
HEADER_LIST "${FILE_LIST}"
DEPENDENCY_TARGET_LIST "${DEPENDENCY_LIST}"
INCLUDE_PATHS "${FLAME_INCLUDE_PATH}"
Expand Down
Loading