@@ -91,38 +91,37 @@ endif()
9191if (DS2_REGSGEN2)
9292 add_executable (RegsGen2::RegsGen2 IMPORTED )
9393 set_target_properties (RegsGen2::RegsGen2 PROPERTIES
94- IMPORTED_LOCATION ${DS2_REGSGEN2} )
94+ IMPORTED_LOCATION ${DS2_REGSGEN2} )
9595else ()
9696 if (CMAKE_HOST_SYSTEM STREQUAL Windows)
97- set (CMAKE_HOST_EXECUTABLE_SUFFIX .exe)
97+ set (CMAKE_HOST_EXECUTABLE_SUFFIX .exe)
9898 else ()
99- set (CMAKE_HOST_EXECUTABLE_SUFFIX)
99+ set (CMAKE_HOST_EXECUTABLE_SUFFIX)
100100 endif ()
101101
102102 get_property (GENERATOR_IS_MULTI_CONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
103103 if (GENERATOR_IS_MULTI_CONFIG)
104- set (RegsGen2_RELATIVE_PATH Release/regsgen2${CMAKE_HOST_EXECUTABLE_SUFFIX} )
104+ set (RegsGen2_RELATIVE_PATH Release/regsgen2${CMAKE_HOST_EXECUTABLE_SUFFIX} )
105105 else ()
106- set (RegsGen2_RELATIVE_PATH regsgen2${CMAKE_HOST_EXECUTABLE_SUFFIX} )
106+ set (RegsGen2_RELATIVE_PATH regsgen2${CMAKE_HOST_EXECUTABLE_SUFFIX} )
107107 endif ()
108108
109109 include (ExternalProject)
110110 ExternalProject_Add(RegsGen2
111- SOURCE_DIR ${PROJECT_SOURCE_DIR} /Tools/RegsGen2
112- BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} /RegsGen2
113- CMAKE_ARGS
114- -DCMAKE_BUILD_TYPE:STRING =Release
115- -DCMAKE_SYSTEM_NAME:STRING =${CMAKE_HOST_SYSTEM_NAME}
116- -DCMAKE_SYSTEM_PROCESSOR:STRING =${CMAKE_HOST_SYSTEM_PROCESSOR}
117- BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release
118- INSTALL_COMMAND ""
119- BUILD_BYPRODUCTS
120- <BINARY_DIR>/${RegsGen2_RELATIVE_PATH} )
111+ SOURCE_DIR ${PROJECT_SOURCE_DIR} /Tools/RegsGen2
112+ BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} /RegsGen2
113+ CMAKE_ARGS
114+ -DCMAKE_BUILD_TYPE:STRING =Release
115+ -DCMAKE_SYSTEM_NAME:STRING =${CMAKE_HOST_SYSTEM_NAME}
116+ -DCMAKE_SYSTEM_PROCESSOR:STRING =${CMAKE_HOST_SYSTEM_PROCESSOR}
117+ BUILD_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --config Release
118+ INSTALL_COMMAND ""
119+ BUILD_BYPRODUCTS <BINARY_DIR>/${RegsGen2_RELATIVE_PATH} )
121120 ExternalProject_Get_Property(RegsGen2 BINARY_DIR)
122121
123122 add_executable (RegsGen2::RegsGen2 IMPORTED )
124123 set_target_properties (RegsGen2::RegsGen2 PROPERTIES
125- IMPORTED_LOCATION ${BINARY_DIR} /${RegsGen2_RELATIVE_PATH} )
124+ IMPORTED_LOCATION ${BINARY_DIR} /${RegsGen2_RELATIVE_PATH} )
126125 add_dependencies (RegsGen2::RegsGen2 RegsGen2)
127126endif ()
128127
@@ -148,7 +147,7 @@ foreach(ARCH ARM ARM64 RISCV32 RISCV64 RISCV128 X86 X86_64)
148147 $<TARGET_FILE:RegsGen2::RegsGen2>
149148 -a ${RegsGenOS}
150149 -I DebugServer2/Architecture/RegisterLayout.h
151- -h -o ${ArchHeadersDir} /RegistersDescriptors.h
150+ -h -o ${ArchHeadersDir} /RegistersDescriptors.h
152151 -f "${PROJECT_SOURCE_DIR} /Definitions/${ARCH} .json"
153152 DEPENDS
154153 Definitions /${ARCH} .json
@@ -162,7 +161,7 @@ foreach(ARCH ARM ARM64 RISCV32 RISCV64 RISCV128 X86 X86_64)
162161 $<TARGET_FILE:RegsGen2::RegsGen2>
163162 -a ${RegsGenOS}
164163 -I DebugServer2/Architecture/${ARCH} /RegistersDescriptors.h
165- -c -o ${ArchSourcesDir} /RegistersDescriptors.cpp
164+ -c -o ${ArchSourcesDir} /RegistersDescriptors.cpp
166165 -f "${PROJECT_SOURCE_DIR} /Definitions/${ARCH} .json"
167166 DEPENDS
168167 Definitions /${ARCH} .json
0 commit comments