Skip to content

Commit 2f90670

Browse files
JPHutchinsJPHutchins
authored
Merge pull request #1 from intercreate/fix/define-strings
Fix/define strings
2 parents 58e067d + 6d20d43 commit 2f90670

2 files changed

Lines changed: 34 additions & 34 deletions

File tree

‎src/ic_project.cmake‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ function(ic_project
8686
endif()
8787
endforeach()
8888

89-
set_definition("${out_client_name}" ${_CLIENT_NAME} PARENT_SCOPE)
90-
set_definition("${out_project_name}" ${_PROJECT_NAME} PARENT_SCOPE)
91-
set_definition("${out_board_name}" "${_BOARD_NAME}" PARENT_SCOPE)
92-
if_set_definition("${out_board_rev}" "${_BOARD_REV}" PARENT_SCOPE)
93-
if_set_definition("${out_fw_version}" "${_FW_VERSION}" PARENT_SCOPE)
94-
if_set_definition("${out_build_type}" "${_BUILD_TYPE}" PARENT_SCOPE)
89+
set_definition_string("${out_client_name}" "${_CLIENT_NAME}" PARENT_SCOPE)
90+
set_definition_string("${out_project_name}" "${_PROJECT_NAME}" PARENT_SCOPE)
91+
set_definition_string("${out_board_name}" "${_BOARD_NAME}" PARENT_SCOPE)
92+
if_set_definition_string("${out_board_rev}" "${_BOARD_REV}" PARENT_SCOPE)
93+
if_set_definition_string("${out_fw_version}" "${_FW_VERSION}" PARENT_SCOPE)
94+
if_set_definition_string("${out_build_type}" "${_BUILD_TYPE}" PARENT_SCOPE)
9595

9696
# Warn about git tag
9797
execute_process(
@@ -123,72 +123,72 @@ function(ic_project
123123
OUTPUT_VARIABLE git_hash
124124
OUTPUT_STRIP_TRAILING_WHITESPACE
125125
)
126-
set_definition("${out_git_hash}" ${git_hash} PARENT_SCOPE)
126+
set_definition_string("${out_git_hash}" "${git_hash}" PARENT_SCOPE)
127127

128128
# Set git dirty commit
129129
string(FIND ${git_hash} + res)
130130
if(res EQUAL -1)
131-
set_definition("${out_git_dirty}" 0 PARENT_SCOPE)
131+
set_definition_string("${out_git_dirty}" 0 PARENT_SCOPE)
132132
else()
133-
set_definition("${out_git_dirty}" 1 PARENT_SCOPE)
133+
set_definition_string("${out_git_dirty}" 1 PARENT_SCOPE)
134134
endif()
135135

136136
if(${has_git_tag})
137137
# Set the git tag
138138
string(REPLACE "-" ";" fw_version_list ${git_tag})
139139
list(GET fw_version_list 0 git_label)
140-
set_definition("${out_git_tag}" ${git_label} PARENT_SCOPE)
140+
set_definition_string("${out_git_tag}" "${git_label}" PARENT_SCOPE)
141141

142142
# Set the git tag revision
143143
list(LENGTH fw_version_list len)
144144
if (len EQUAL 3)
145145
list(GET fw_version_list 1 git_tag_rev)
146-
set_definition("${out_git_tag_rev}" ${git_tag_rev} PARENT_SCOPE)
146+
set_definition_string("${out_git_tag_rev}" "${git_tag_rev}" PARENT_SCOPE)
147147
else()
148-
set_definition("${out_git_tag_rev}" "" PARENT_SCOPE)
148+
set_definition_string("${out_git_tag_rev}" "" PARENT_SCOPE)
149149
endif()
150150
else()
151-
set_definition("${out_git_tag}" "" PARENT_SCOPE)
152-
set_definition("${out_git_tag_rev}" "" PARENT_SCOPE)
151+
set_definition_string("${out_git_tag}" "" PARENT_SCOPE)
152+
set_definition_string("${out_git_tag_rev}" "" PARENT_SCOPE)
153153
endif()
154154

155155
if(NOT DEFINED ${out_fw_version})
156156
if(${has_git_tag})
157157
if(NOT "${git_tag_rev}" STREQUAL "")
158-
set_definition("${out_fw_version}" "${git_label}-${git_tag_rev}" PARENT_SCOPE)
158+
set_definition_string("${out_fw_version}" "${git_label}-${git_tag_rev}" PARENT_SCOPE)
159159
else()
160-
set_definition("${out_fw_version}" "${git_label}" PARENT_SCOPE)
160+
set_definition_string("${out_fw_version}" "${git_label}" PARENT_SCOPE)
161161
endif()
162162
else()
163-
set_definition("${out_fw_version}" ${git_hash} PARENT_SCOPE)
163+
set_definition_string("${out_fw_version}" "${git_hash}" PARENT_SCOPE)
164164
endif()
165165
endif()
166166

167167
string(TIMESTAMP build_date "%Y%m%d")
168-
set_definition("${out_build_date}" ${build_date} PARENT_SCOPE)
168+
set_definition_string("${out_build_date}" "${build_date}" PARENT_SCOPE)
169169
string(TIMESTAMP timestamp)
170-
set_definition("${out_build_time}" ${timestamp} PARENT_SCOPE)
170+
set_definition_string("${out_build_time}" "${timestamp}" PARENT_SCOPE)
171171

172172
# Set user info
173173
execute_process(
174174
COMMAND git config user.name
175175
OUTPUT_VARIABLE user_name
176176
OUTPUT_STRIP_TRAILING_WHITESPACE
177177
)
178-
set_definition("${out_git_user_name}" ${user_name} PARENT_SCOPE)
178+
set_definition_string("${out_git_user_name}" "${user_name}" PARENT_SCOPE)
179179
execute_process(
180180
COMMAND git config user.email
181181
OUTPUT_VARIABLE user_email
182182
OUTPUT_STRIP_TRAILING_WHITESPACE
183183
)
184-
set_definition("${out_git_user_email}" ${user_email} PARENT_SCOPE)
184+
set_definition_string("${out_git_user_email}" "${user_email}" PARENT_SCOPE)
185185

186186
# Set build environment info
187-
set_definition("${out_c_compiler_id}" ${CMAKE_C_COMPILER_ID} PARENT_SCOPE)
188-
set_definition("${out_c_compiler}" ${CMAKE_C_COMPILER} PARENT_SCOPE)
189-
set_definition("${out_c_compiler_version}" ${CMAKE_C_COMPILER_VERSION} PARENT_SCOPE)
190-
set_definition("${out_host_system_name}" ${CMAKE_HOST_SYSTEM} PARENT_SCOPE)
191-
set_definition("${out_host_system_version}" ${CMAKE_HOST_SYSTEM_VERSION} PARENT_SCOPE)
187+
set_definition_string("${out_c_compiler_id}" "${CMAKE_C_COMPILER_ID}" PARENT_SCOPE)
188+
set_definition_string("${out_c_compiler}" "${CMAKE_C_COMPILER}" PARENT_SCOPE)
189+
set_definition_string("${out_c_compiler_version}" "${CMAKE_C_COMPILER_VERSION}" PARENT_SCOPE)
190+
set_definition_string("${out_host_system_name}" "${CMAKE_HOST_SYSTEM_NAME}" PARENT_SCOPE)
191+
set_definition_string("${out_host_system_version}" "${CMAKE_HOST_SYSTEM_VERSION}" PARENT_SCOPE)
192192

193193
if(NOT "" STREQUAL "${_BOARD_REV}")
194194
set(board_rev_string @${_BOARD_REV})
@@ -204,7 +204,7 @@ function(ic_project
204204
"${_CLIENT_NAME}_${_PROJECT_NAME}_${_BOARD_NAME}${board_rev_string}_${${out_fw_version}}_${git_hash}_${build_date}${build_type_string}"
205205
)
206206
string(REPLACE " " "_" config_string ${config_string})
207-
set_definition("${out_full_name}" ${config_string} PARENT_SCOPE)
207+
set_definition_string("${out_full_name}" "${config_string}" PARENT_SCOPE)
208208

209209
endfunction()
210210

‎src/ic_utils.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ set() the CMake variable and add_compile_definition()
2626
<value> : the value to set name to
2727
[PARENT_SCOPE] : call set() with PARENT_SCOPE
2828
#]]
29-
macro(set_definition name value)
29+
macro(set_definition_string name value)
3030
if(NOT ${ARGC} EQUAL 2 AND NOT ${ARGC} EQUAL 3)
3131
message(
3232
FATAL_ERROR
33-
"Invalid arguments to set_definition(<name> <value> [PARENT_SCOPE]): (${name} ${value} ${ARGN})"
33+
"Invalid arguments to set_definition_string(<name> <value> [PARENT_SCOPE]): (${name} ${value} ${ARGN})"
3434
)
3535
elseif(${ARGC} EQUAL 3 AND NOT ${ARG2} EQUAL PARENT_SCOPE)
3636
message(
3737
FATAL_ERROR
38-
"Invalid arguments to set_definition(<name> <value> [PARENT_SCOPE]): (${name} ${value} ${ARGN})"
38+
"Invalid arguments to set_definition_string(<name> <value> [PARENT_SCOPE]): (${name} ${value} ${ARGN})"
3939
)
4040
endif()
4141

@@ -45,19 +45,19 @@ macro(set_definition name value)
4545

4646
set(${name} ${value} ${ARGN})
4747
set(${name} ${value})
48-
add_compile_definitions(${name}=${value})
48+
add_compile_definitions(${name}="${value}")
4949
message(STATUS "${name} = ${value}")
5050
endmacro()
5151

5252
#[[
53-
set_definition() only if value is defined as something other than ""
53+
set_definition_string() only if value is defined as something other than ""
5454
5555
<name> : CMake variable and compile definition name to set
5656
<value> : the value to set name to
5757
[PARENT_SCOPE] : call set() with PARENT_SCOPE
5858
#]]
59-
macro(if_set_definition name value)
59+
macro(if_set_definition_string name value)
6060
if(NOT "" STREQUAL "${value}")
61-
set_definition(${name} ${value} ${ARGN})
61+
set_definition_string(${name} ${value} ${ARGN})
6262
endif()
6363
endmacro()

0 commit comments

Comments
 (0)