Skip to content

Commit 1721477

Browse files
committed
Adjusted the defined variables to the header for make it readable.
Fixed the bug that cmake had no clue of argument no initial call. Changes to be committed: modified: cmake/Macro.cmake modified: src-macro/CMakeLists.txt
1 parent 8a01e08 commit 1721477

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

cmake/Macro.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ function(ae2f_Macro_init prm_CMT_REQUIRED prm_SZPARAM prm_SZTPARAM)
77
file(REMOVE_RECURSE ${ae2f_Macro_ROOT}/build/bin)
88
message("[ae2f_Macro_init] ${CMAKE_GENERATOR}")
99

10-
if(${CMAKE_C_STANDARD})
10+
if(DEFINED CMAKE_C_STANDARD)
1111
set(cstd "-DCMAKE_C_STANDARD=${CMAKE_C_STANDARD}")
1212
else()
1313
set(cstd "")
1414
endif()
1515

16-
if(${CMAKE_C_COMPILER})
16+
if(DEFINED CMAKE_C_COMPILER)
1717
set(cc "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}")
1818
else()
1919
set(cc "")
2020
endif()
2121

22-
if(${CMAKE_GENERATOR})
22+
if(DEFINED CMAKE_GENERATOR)
2323
set(gen "-G${CMAKE_GENERATOR}")
2424
else()
2525
set(gen "")

src-macro/CMakeLists.txt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ set(ae2f_Macro_SZPARAM 50)
1111
set(ae2f_Macro_SZTPARAM 300)
1212
set(ae2f_MAC_KEYWORD ae2f_MAC)
1313

14-
file(WRITE ${PROJECT_SOURCE_DIR}/main.auto.h "#define ae2f_MAC_KEYWORD \"${ae2f_MAC_KEYWORD}\"")
15-
16-
target_compile_definitions(Macro PRIVATE -DCMT_REQUIRED=${ae2f_Macro_CMT_REQUIRED})
17-
target_compile_definitions(Macro PRIVATE -DSZPARAM=${ae2f_Macro_SZPARAM})
18-
target_compile_definitions(Macro PRIVATE -DSZTPARAM=${ae2f_Macro_SZTPARAM})
14+
file(WRITE ${PROJECT_SOURCE_DIR}/main.auto.h "#define ae2f_MAC_KEYWORD \"${ae2f_MAC_KEYWORD}\"\n")
15+
file(APPEND ${PROJECT_SOURCE_DIR}/main.auto.h "#define CMT_REQUIRED ${ae2f_Macro_CMT_REQUIRED}\n")
16+
file(APPEND ${PROJECT_SOURCE_DIR}/main.auto.h "#define SZPARAM ${ae2f_Macro_SZPARAM}\n")
17+
file(APPEND ${PROJECT_SOURCE_DIR}/main.auto.h "#define SZTPARAM ${ae2f_Macro_SZTPARAM}")

0 commit comments

Comments
 (0)