Move generated directory to build directory

StepMania generates some files during build but it's a bit unusual to generate
them in source directory instead of build directory. Move them to build
directory and remove src/generated from .gitignore.
This commit is contained in:
phantom10111
2024-04-09 14:33:43 +02:00
committed by teejusb
parent ff3ce9544a
commit 48e797bf35
6 changed files with 10 additions and 10 deletions
-1
View File
@@ -17,7 +17,6 @@ Build/
!Build/INSTALL.md
!Build/README.md
verdata.*
src/generated
# Text Editor Based Items
___*
+5 -2
View File
@@ -16,6 +16,9 @@ set(SM_SRC_DIR "${CMAKE_CURRENT_LIST_DIR}/src")
set(SM_DOC_DIR "${CMAKE_CURRENT_LIST_DIR}/Docs")
set(SM_ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}")
set(SM_GENERATED_DIR "${PROJECT_BINARY_DIR}/generated")
set(SM_GENERATED_SRC_DIR "${SM_GENERATED_DIR}/src")
# TODO: Reconsile the OS dependent naming scheme.
set(SM_EXE_NAME "ITGmania")
@@ -349,9 +352,9 @@ elseif(LINUX)
endif(WIN32) # LINUX, APPLE
configure_file("${SM_SRC_DIR}/config.in.hpp"
"${SM_SRC_DIR}/generated/config.hpp")
"${SM_GENERATED_SRC_DIR}/config.hpp")
configure_file("${SM_SRC_DIR}/verstub.in.cpp"
"${SM_SRC_DIR}/generated/verstub.cpp")
"${SM_GENERATED_SRC_DIR}/verstub.cpp")
# Define installer based items for cpack.
include("${CMAKE_CURRENT_LIST_DIR}/CMake/CPackSetup.cmake")
+2 -2
View File
@@ -3,10 +3,10 @@ list(APPEND SMDATA_GLOBAL_FILES_SRC
"global.cpp"
"SpecialFiles.cpp"
"StepMania.cpp" # TODO: Refactor into separate main project.
"${SM_SRC_DIR}/generated/verstub.cpp")
"${SM_GENERATED_SRC_DIR}/verstub.cpp")
list(APPEND SMDATA_GLOBAL_FILES_HPP
"generated/config.hpp"
"${SM_GENERATED_SRC_DIR}/config.hpp"
"GameLoop.h"
"global.h"
"ProductInfo.h" # TODO: Have this be auto-generated.
+1 -1
View File
@@ -13,7 +13,7 @@ set_property(TARGET "LoadingWindowGtk" PROPERTY CXX_STANDARD_REQUIRED ON)
set_property(TARGET "LoadingWindowGtk" PROPERTY CXX_EXTENSIONS ON)
target_include_directories("LoadingWindowGtk" PRIVATE "${SM_SRC_DIR}"
"${SM_SRC_DIR}/generated"
"${SM_GENERATED_SRC_DIR}"
"${SM_SRC_DIR}/arch/LoadingWindow"
"${GTK3_INCLUDE_DIRS}")
+1 -3
View File
@@ -1,5 +1,3 @@
file(MAKE_DIRECTORY "${SM_SRC_DIR}/generated")
if(MSVC)
# Add the mapconv program of the past to allow for debugging information.
include("CMakeProject-mapconv.cmake")
@@ -448,7 +446,7 @@ endif()
target_link_libraries("${SM_EXE_NAME}" ${SMDATA_LINK_LIB})
list(APPEND SM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
"${SM_SRC_DIR}/generated")
"${SM_GENERATED_SRC_DIR}")
if(APPLE)
list(APPEND SM_INCLUDE_DIRS "archutils/Unix")
+1 -1
View File
@@ -44,7 +44,7 @@ target_link_libraries("TextureFontGenerator" ${TEXTURE_LINK_LIB})
list(APPEND TEXTURE_INCLUDE_DIRS
"${TEXTURE_DIR}"
"${TEXTURE_DIR}/res"
"${SM_SRC_DIR}/generated")
"${SM_GENERATED_SRC_DIR}")
target_include_directories("TextureFontGenerator"
PUBLIC ${TEXTURE_INCLUDE_DIRS})