Username404-59
/
Yerbacon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't append CMAKE_CXX_COMPILER_ARCHITECTURE_ID to CPACK_SYSTEM_NAME + CPACK_TOPLEVEL_TAG, and remove a few newlines in ParseComponents.hpp

This commit is contained in:
Username404 2021-09-19 21:37:53 +02:00
parent 1371457a1f
commit 6ce13be4ca
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -180,8 +180,8 @@ elseif(MINGW OR MSVC)
set(CPACK_NSIS_MUI_ICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/${PROJECT_NAME}.ico")
set(CPACK_NSIS_MUI_UNIICON "${CMAKE_CURRENT_SOURCE_DIR}/resources/${PROJECT_NAME}.ico")
set(CPACK_NSIS_DEFINES "RequestExecutionLevel highest")
set(CPACK_SYSTEM_NAME "Win32-${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
set(CPACK_TOPLEVEL_TAG "Win32-${CMAKE_CXX_COMPILER_ARCHITECTURE_ID}")
set(CPACK_SYSTEM_NAME "Win32")
set(CPACK_TOPLEVEL_TAG "Win32")
set(CPACK_NSIS_MODIFY_PATH ON)
set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
if (WIN32)

9
src/headers/parsing/ParseComponents.hpp
View File

@ -88,13 +88,10 @@ public:
inline size_t getCompCount() const { return subComponents.size(); }
IS_PARSECOMPONENT inline void add(const T& component) { addComponent<T>(component); };
IS_PARSECOMPONENT inline void addAll(const initializer_list<T>& components) { addAllComponents<T>(components); }
IS_PARSECOMPONENT
inline ParseTree& operator<<(const T& component) { add(component); return *this; }
IS_PARSECOMPONENT inline ParseTree& operator<<(const T& component) { add(component); return *this; }
ParseTree(): subComponents() {};
IS_PARSECOMPONENT
constexpr explicit ParseTree(const T& element): ParseTree() { addComponent(element); }
IS_PARSECOMPONENT
constexpr ParseTree(const initializer_list<T>& elements): ParseTree() { addAllComponents(elements); }
IS_PARSECOMPONENT constexpr explicit ParseTree(const T& element): ParseTree() { addComponent(element); }
IS_PARSECOMPONENT constexpr ParseTree(const initializer_list<T>& elements): ParseTree() { addAllComponents(elements); }
ParseTree(const initializer_list<ParseComponent*>& elements): ParseTree() {
for_each(elements.begin(), elements.end(), [&](ParseComponent* component){
subComponents.emplace_back(component);