Skip to content

Commit 2e3a471

Browse files
committed
bugfixes
1 parent 2b3ce06 commit 2e3a471

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

RTEMSCompilerConfig.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ function(rtems_compiler_config RTEMS_PREFIX RTEMS_BSP)
22

33
message(STATUS "Setting up and checking RTEMS cross compile configuration..")
44

5-
option(RTEMS_VERBOSE "Verbose output for the RTEMS CMake support" FALSE)
6-
75

86
set(RTEMS_PREFIX ${RTEMS_PREFIX} CACHE FILEPATH "RTEMS prefix")
97
set(RTEMS_BSP ${RTEMS_BSP} CACHE STRING "RTEMS BSP")

RTEMSPreProjectConfig.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535

3636
function(rtems_pre_project_config RTEMS_PREFIX RTEMS_BSP)
3737

38+
option(RTEMS_VERBOSE "Additional RTEMS CMake configuration information" FALSE)
39+
3840
if(NOT DEFINED RTEMS_CONFIG_DIR)
3941
message(STATUS
4042
"RTEMS_CONFIG_DIR not set. Assuming the CMake support was "

cmake_build_config.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ def main():
2929
help="Additional custom defines passed to CMake (suply without -D prefix!)",
3030
nargs="*", type=str)
3131
parser.add_argument("-s", "--sources", type=str, help="Filepath of project sources")
32+
parser.add_argument("-v", "--verbose", help="Verbose CMake build configuration",
33+
action="store_true")
3234

3335
args = parser.parse_args()
3436

@@ -69,6 +71,10 @@ def main():
6971
print("Error: RTEMS prefix has to be specified!")
7072
sys.exit(1)
7173

74+
rtems_verbose_args = ""
75+
if args.verbose:
76+
rtems_verbose_args = f"-DRTEMS_VERBOSE=TRUE"
77+
7278
define_string = ""
7379
if args.defines is not None:
7480
for define in args.defines:
@@ -95,7 +101,8 @@ def main():
95101
os.chdir(build_folder)
96102

97103
cmake_command = f"cmake {generator_cmake_arg} -DCMAKE_BUILD_TYPE=\"{cmake_build_type}\" " \
98-
f"{cmake_rtems_bsp} {rtems_prefix_arg} {define_string} {source_location}"
104+
f"{cmake_rtems_bsp} {rtems_prefix_arg} {define_string} {rtems_verbose_args} "\
105+
f"{source_location}"
99106
# Remove redundant spaces
100107
cmake_command = ' '.join(cmake_command.split())
101108
print("Running CMake command: ")

0 commit comments

Comments
 (0)