Skip to content

Commit c57d51c

Browse files
authored
Merge pull request #137 from Distributive-Network/Xmader/chore/directory-structure-housekeeping
Chore: organize the directory structure
2 parents 1b24f07 + e0757d9 commit c57d51c

File tree

9 files changed

+6
-9
lines changed

9 files changed

+6
-9
lines changed

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1414

1515
# Add an external; appends to `PYTHONMONKEY_EXTERNAL_FILES` in the parent scope.
1616
function(pythonmonkey_add_external PYTHONMONKEY_EXTERNAL)
17-
add_subdirectory("externals/${PYTHONMONKEY_EXTERNAL}")
18-
set(PYTHONMONKEY_EXTERNAL_FILE "externals/${PYTHONMONKEY_EXTERNAL}/CMakeLists.txt")
17+
add_subdirectory("cmake/externals/${PYTHONMONKEY_EXTERNAL}")
18+
set(PYTHONMONKEY_EXTERNAL_FILE "cmake/externals/${PYTHONMONKEY_EXTERNAL}/CMakeLists.txt")
1919
source_group(
20-
TREE "${CMAKE_CURRENT_SOURCE_DIR}/externals/${PYTHONMONKEY_EXTERNAL}"
20+
TREE "${CMAKE_CURRENT_SOURCE_DIR}/cmake/externals/${PYTHONMONKEY_EXTERNAL}"
2121
PREFIX "Externals\\${PYTHONMONKEY_EXTERNAL}"
2222
FILES "${PYTHONMONKEY_EXTERNAL_FILE}"
2323
)
@@ -69,7 +69,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
6969
# Add doxygen if this is the main app
7070
find_package(Doxygen)
7171
if(Doxygen_FOUND)
72-
add_subdirectory(docs)
72+
add_subdirectory(cmake/docs)
7373
else()
7474
message(STATUS "Doxygen not found. Not building docs.")
7575
endif()
@@ -81,4 +81,4 @@ add_subdirectory(src)
8181

8282
pythonmonkey_add_external("uncrustify")
8383
pythonmonkey_add_external("autopep8")
84-
add_subdirectory(format)
84+
add_subdirectory(cmake/format)
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ option(BUILD_DOC "Build documentation" ON)
55
find_package(Doxygen)
66
if (DOXYGEN_FOUND)
77
# set input and output files
8-
set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/../docs/Doxyfile.in)
8+
set(DOXYGEN_IN ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in)
99
set(DOXYGEN_OUT ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
1010

1111
# request to configure the file
File renamed without changes.
File renamed without changes.

pyproject.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ include = [
2020
{ path = "src", format = "sdist" },
2121
{ path = "include", format = "sdist" },
2222
{ path = "cmake", format = "sdist" },
23-
{ path = "docs", format = "sdist" }, # TODO: organize files
24-
{ path = "externals", format = "sdist" },
25-
{ path = "format", format = "sdist" },
2623
{ path = "tests", format = "sdist" },
2724
{ path = "CMakeLists.txt", format = "sdist" },
2825
{ path = "*.sh", format = "sdist" },

0 commit comments

Comments
 (0)