diff options
author | Ben Boeckel <mathstuf@gmail.com> | 2015-02-04 11:53:59 -0500 |
---|---|---|
committer | Ben Boeckel <mathstuf@gmail.com> | 2015-02-07 21:06:44 -0500 |
commit | ff394024a0436160855bcbd4c20856efc83647e3 (patch) | |
tree | 73d0fe8a494ccf631e6eb99d1bb6fba1d3dbda1e | |
parent | 0fd1763e028be5ef6a4fd695a18ae19234ebdaf7 (diff) | |
download | coreclr-ff394024a0436160855bcbd4c20856efc83647e3.tar.gz coreclr-ff394024a0436160855bcbd4c20856efc83647e3.tar.bz2 coreclr-ff394024a0436160855bcbd4c20856efc83647e3.zip |
Use list(APPEND) rather than set(var ${var} ...) in CMake
This avoids a variable expansion and avoids the chances of a typo being
introduced in variable names.
-rw-r--r-- | CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/ToolBox/SOS/Strike/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/debug/daccess/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/debug/ee/CMakeLists.txt | 9 | ||||
-rw-r--r-- | src/dlls/dbgshim/CmakeLists.txt | 2 | ||||
-rw-r--r-- | src/dlls/mscordac/CMakeLists.txt | 5 | ||||
-rw-r--r-- | src/dlls/mscordbi/CMakeLists.txt | 10 | ||||
-rw-r--r-- | src/dlls/mscoree/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 12 | ||||
-rw-r--r-- | src/inc/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/utilcode/CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/utilcode/staticnohost/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/vm/CMakeLists.txt | 15 | ||||
-rw-r--r-- | src/vm/wks/CMakeLists.txt | 2 |
14 files changed, 36 insertions, 50 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0958c9d7cf..096cee3b81 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,7 @@ function(get_compile_definitions DefinitionName) else() set(DEFINITION -D${DEFINITION}) endif() - set(DEFINITIONS ${DEFINITIONS} ${DEFINITION}) + list(APPEND DEFINITIONS ${DEFINITION}) endforeach() set(${DefinitionName} ${DEFINITIONS} PARENT_SCOPE) endfunction(get_compile_definitions) @@ -39,7 +39,7 @@ endfunction(get_compile_definitions) function(get_include_directories IncludeDirectories) get_directory_property(dirs INCLUDE_DIRECTORIES) foreach(dir IN LISTS dirs) - set(INC_DIRECTORIES ${INC_DIRECTORIES} -I${dir}) + list(APPEND INC_DIRECTORIES -I${dir}) endforeach() set(${IncludeDirectories} ${INC_DIRECTORIES} PARENT_SCOPE) endfunction(get_include_directories) @@ -50,7 +50,7 @@ endfunction(get_include_directories) function(convert_to_absolute_path RetSources) set(Sources ${ARGN}) foreach(Source IN LISTS Sources) - set(AbsolutePathSources ${AbsolutePathSources} ${CMAKE_CURRENT_SOURCE_DIR}/${Source}) + list(APPEND AbsolutePathSources ${CMAKE_CURRENT_SOURCE_DIR}/${Source}) endforeach() set(${RetSources} ${AbsolutePathSources} PARENT_SCOPE) endfunction(convert_to_absolute_path) diff --git a/src/ToolBox/SOS/Strike/CMakeLists.txt b/src/ToolBox/SOS/Strike/CMakeLists.txt index bf8cc2be4c..b6e52b718d 100644 --- a/src/ToolBox/SOS/Strike/CMakeLists.txt +++ b/src/ToolBox/SOS/Strike/CMakeLists.txt @@ -43,13 +43,13 @@ set(SOS_SOURCES_AMD64 disasmX86.cpp ) -set(SOS_SOURCES ${SOS_SOURCES} ${SOS_SOURCES_AMD64}) +list(APPEND SOS_SOURCES ${SOS_SOURCES_AMD64}) add_definitions(-DFX_VER_INTERNALNAME_STR=SOS.dll) #Preprocess exports definition file preprocess_def_file(${CMAKE_CURRENT_SOURCE_DIR}/sos.def ${CMAKE_CURRENT_BINARY_DIR}/sos.def) -set(SOS_SOURCES ${SOS_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/sos.def) +list(APPEND SOS_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/sos.def) set(SOS_LIBRARY corguids diff --git a/src/debug/daccess/CMakeLists.txt b/src/debug/daccess/CMakeLists.txt index 0920bd82c1..cdea53390c 100644 --- a/src/debug/daccess/CMakeLists.txt +++ b/src/debug/daccess/CMakeLists.txt @@ -36,13 +36,11 @@ set(DACCESS_SOURCES if(IS_64BIT_BUILD EQUAL 1) include_directories(amd64) - set(DACCESS_SOURCES - ${DACCESS_SOURCES} + list(APPEND DACCESS_SOURCES amd64/primitives.cpp ) else() - set(DACCESS_SOURCES - ${DACCESS_SOURCES} + list(APPEND DACCESS_SOURCES i386/primitives.cpp ) endif(IS_64BIT_BUILD EQUAL 1) diff --git a/src/debug/ee/CMakeLists.txt b/src/debug/ee/CMakeLists.txt index 4cbfe4c8e2..f0f8735220 100644 --- a/src/debug/ee/CMakeLists.txt +++ b/src/debug/ee/CMakeLists.txt @@ -33,8 +33,7 @@ set(CORDBEE_SOURCES_DAC ) if(WIN32) - set(CORDBEE_SOURCES_WKS - ${CORDBEE_SOURCES_WKS} + list(APPEND CORDBEE_SOURCES_WKS # The following files need to be ported to Linux inprocdac.cpp dbgtransportproxy.cpp @@ -43,9 +42,9 @@ if(WIN32) endif(WIN32) if (IS_64BIT_BUILD EQUAL 1) - set(CORDBEE_SOURCES_WKS ${CORDBEE_SOURCES_WKS} amd64/amd64walker.cpp) + list(APPEND CORDBEE_SOURCES_WKS amd64/amd64walker.cpp) else () - set(CORDBEE_SOURCES_WKS ${CORDBEE_SOURCES_WKS} i386/x86walker.cpp) + list(APPEND CORDBEE_SOURCES_WKS i386/x86walker.cpp) endif (IS_64BIT_BUILD EQUAL 1) convert_to_absolute_path(CORDBEE_SOURCES_DAC ${CORDBEE_SOURCES_DAC}) @@ -54,4 +53,4 @@ convert_to_absolute_path(CORDBEE_SOURCES_WKS ${CORDBEE_SOURCES_WKS}) set(CORDBEE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) add_subdirectory(dac) -add_subdirectory(wks)
\ No newline at end of file +add_subdirectory(wks) diff --git a/src/dlls/dbgshim/CmakeLists.txt b/src/dlls/dbgshim/CmakeLists.txt index fde787de31..14bf9831aa 100644 --- a/src/dlls/dbgshim/CmakeLists.txt +++ b/src/dlls/dbgshim/CmakeLists.txt @@ -12,7 +12,7 @@ add_definitions(-DFX_VER_INTERNALNAME_STR=dbgshim.dll) preprocess_def_file(${CMAKE_CURRENT_SOURCE_DIR}/dbgshim.ntdef ${CMAKE_CURRENT_BINARY_DIR}/dbgshim.def) -set(DBGSHIM_SOURCES ${DBGSHIM_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/dbgshim.def) +list(APPEND DBGSHIM_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dbgshim.def) add_library(dbgshim SHARED ${DBGSHIM_SOURCES}) diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index d50ab5d38e..ee39e99e4a 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -9,7 +9,7 @@ set(CLR_DAC_SOURCES add_definitions(-DFX_VER_INTERNALNAME_STR=mscordaccore.dll) if(WIN32) - set(CLR_DAC_SOURCES ${CLR_DAC_SOURCES} + list(APPEND CLR_DAC_SOURCES Native.rc ) set(DEF_SOURCES @@ -65,8 +65,7 @@ if(WIN32) ${STATIC_MT_CRT_LIB} ) else() - set(COREDAC_LIBRARIES - ${COREDAC_LIBRARIES} + list(APPEND COREDAC_LIBRARIES palrt ) endif(WIN32) diff --git a/src/dlls/mscordbi/CMakeLists.txt b/src/dlls/mscordbi/CMakeLists.txt index 23c6b4b281..627da37524 100644 --- a/src/dlls/mscordbi/CMakeLists.txt +++ b/src/dlls/mscordbi/CMakeLists.txt @@ -5,7 +5,7 @@ set(MSCORDBI_SOURCES if(WIN32) add_definitions(-DFX_VER_INTERNALNAME_STR=mscordbi.dll) - set(MSCORDBI_SOURCES ${MSCORDBI_SOURCES} + list(APPEND MSCORDBI_SOURCES Native.rc ) @@ -16,7 +16,7 @@ if(WIN32) preprocess_def_file(${DEF_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/mscordbi.def) - set(MSCORDBI_SOURCES ${MSCORDBI_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/mscordbi.def) + list(APPEND MSCORDBI_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/mscordbi.def) endif(WIN32) add_library(mscordbi SHARED @@ -35,8 +35,7 @@ set(COREDBI_LIBRARIES ) if(WIN32) - set(COREDBI_LIBRARIES - ${COREDBI_LIBRARIES} + list(APPEND COREDBI_LIBRARIES ipcmanager-staticcrt mdhotdata-staticcrt mdwinmd_dbi @@ -53,8 +52,7 @@ if(WIN32) target_link_libraries(mscordbi ${COREDBI_LIBRARIES}) elseif(CLR_CMAKE_PLATFORM_UNIX) - set(COREDBI_LIBRARIES - ${COREDBI_LIBRARIES} + list(APPEND COREDBI_LIBRARIES mdhotdata_full palrt CoreClrPal diff --git a/src/dlls/mscoree/CMakeLists.txt b/src/dlls/mscoree/CMakeLists.txt index 5ed608afc8..346ec0de88 100644 --- a/src/dlls/mscoree/CMakeLists.txt +++ b/src/dlls/mscoree/CMakeLists.txt @@ -5,7 +5,7 @@ set(CLR_SOURCES ) if(WIN32) -set(CLR_SOURCES ${CLR_SOURCES} +list(APPEND CLR_SOURCES comcallunmarshal.cpp delayload.cpp Native.rc @@ -16,7 +16,7 @@ set (DEF_SOURCES ) convert_to_absolute_path(DEF_SOURCES ${DEF_SOURCES}) else() -set(CLR_SOURCES ${CLR_SOURCES} +list(APPEND CLR_SOURCES unixinterface.cpp ) endif(WIN32) diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt index 2d346b2959..46b2936dae 100644 --- a/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -1,7 +1,7 @@ if (WIN32) preprocess_def_file(${DEF_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/coreclr.def) -set(CLR_SOURCES ${CLR_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/coreclr.def) +list(APPEND CLR_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/coreclr.def) set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /ENTRY:CoreDllMain") @@ -59,8 +59,7 @@ set(CORECLR_LIBRARIES ) if(WIN32) - set(CORECLR_LIBRARIES - ${CORECLR_LIBRARIES} + list(APPEND CORECLR_LIBRARIES mdwinmd_wks comnls_wks comcrypt_wks @@ -78,8 +77,7 @@ if(WIN32) RuntimeObject.lib ) else() - set(CORECLR_LIBRARIES - ${CORECLR_LIBRARIES} + list(APPEND CORECLR_LIBRARIES CoreClrPal palrt ) @@ -94,8 +92,8 @@ if(WIN32) # Add dac table & debug resource to coreclr get_include_directories(INC_DIR) get_compile_definitions(PREPROCESS_DEFINITIONS) - set(INC_DIR ${INC_DIR} -I${CLR_DIR}/src/vm -I${CLR_DIR}/src/vm/amd64 -I${CLR_DIR}/src/debug/ee -I${CLR_DIR}/src/gc) - set(PREPROCESS_DEFINITIONS ${PREPROCESS_DEFINITIONS} -DDACCESS_COMPILE -DDBG_TARGET_64BIT=1 -DDBG_TARGET_WIN64=1 -DDBG_TARGET_AMD64=1) + list(APPEND INC_DIR -I${CLR_DIR}/src/vm -I${CLR_DIR}/src/vm/amd64 -I${CLR_DIR}/src/debug/ee -I${CLR_DIR}/src/gc) + list(APPEND PREPROCESS_DEFINITIONS -DDACCESS_COMPILE -DDBG_TARGET_64BIT=1 -DDBG_TARGET_WIN64=1 -DDBG_TARGET_AMD64=1) add_custom_command(TARGET coreclr POST_BUILD COMMAND ${CMAKE_CXX_COMPILER} /P /EP /TP ${PREPROCESS_DEFINITIONS} ${INC_DIR} /Fi${CMAKE_CURRENT_BINARY_DIR}/daccess.i ${CLR_DIR}/src/debug/daccess/daccess.cpp diff --git a/src/inc/CMakeLists.txt b/src/inc/CMakeLists.txt index d27a3b89c4..66037d2da5 100644 --- a/src/inc/CMakeLists.txt +++ b/src/inc/CMakeLists.txt @@ -34,7 +34,7 @@ FIND_PROGRAM( MIDL midl.exe ) foreach(GENERATE_IDL IN LISTS CORGUIDS_IDL_SOURCES) get_filename_component(IDLNAME ${GENERATE_IDL} NAME_WE) set(OUT_NAME ${CMAKE_CURRENT_BINARY_DIR}/idls_out/${IDLNAME}_i.c) - set(CORGUIDS_SOURCES ${CORGUIDS_SOURCES} ${OUT_NAME}) + list(APPEND CORGUIDS_SOURCES ${OUT_NAME}) add_custom_command(OUTPUT ${OUT_NAME} COMMAND ${MIDL} ${MIDL_INCLUDE_DIRECTORIES} /h ${CMAKE_CURRENT_BINARY_DIR}/idls_out/${IDLNAME}.h ${MIDL_DEFINITIONS} /out ${CMAKE_CURRENT_BINARY_DIR}/idls_out ${CMAKE_CURRENT_SOURCE_DIR}/${GENERATE_IDL} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${GENERATE_IDL} @@ -53,7 +53,7 @@ else() foreach(IDL_SOURCE IN LISTS CORGUIDS_IDL_SOURCES) get_filename_component(IDLNAME ${IDL_SOURCE} NAME_WE) set(C_SOURCE ../pal/prebuilt/idl/${IDLNAME}_i.c) - set(CORGUIDS_SOURCES ${CORGUIDS_SOURCES} ${C_SOURCE}) + list(APPEND CORGUIDS_SOURCES ${C_SOURCE}) endforeach(IDL_SOURCE) endif(WIN32) diff --git a/src/utilcode/CMakeLists.txt b/src/utilcode/CMakeLists.txt index ea760e4f97..3d2140bd79 100644 --- a/src/utilcode/CMakeLists.txt +++ b/src/utilcode/CMakeLists.txt @@ -72,8 +72,7 @@ set(UTILCODE_SOURCES # They should be moved out from here into the declaration # of UTILCODE_SOURCES above after fixing compiler errors. if(WIN32) - set(UTILCODE_SOURCES - ${UTILCODE_SOURCES} + list(APPEND UTILCODE_SOURCES appxutil.cpp dlwrap.cpp downlevel.cpp diff --git a/src/utilcode/staticnohost/CMakeLists.txt b/src/utilcode/staticnohost/CMakeLists.txt index f28aa9774f..254ada1ff9 100644 --- a/src/utilcode/staticnohost/CMakeLists.txt +++ b/src/utilcode/staticnohost/CMakeLists.txt @@ -3,9 +3,9 @@ add_definitions(-DSELF_NO_HOST) if(WIN32) add_definitions(-D_CRTIMP=) # use static version of crt - set(UTILCODE_SOURCES ${UTILCODE_SOURCES} ../hostimpl.cpp) + list(APPEND UTILCODE_SOURCES ../hostimpl.cpp) add_library(utilcodestaticnohost STATIC ${UTILCODE_SOURCES}) elseif(CLR_CMAKE_PLATFORM_UNIX) add_library(utilcodestaticnohost STATIC ${UTILCODE_SOURCES}) -endif(WIN32)
\ No newline at end of file +endif(WIN32) diff --git a/src/vm/CMakeLists.txt b/src/vm/CMakeLists.txt index 14591c37cf..f777e41443 100644 --- a/src/vm/CMakeLists.txt +++ b/src/vm/CMakeLists.txt @@ -257,8 +257,7 @@ set(VM_SOURCES_DAC_AND_WKS_WIN32 winrttypenameconverter.cpp ) -set(VM_SOURCES_WKS - ${VM_SOURCES_WKS} +list(APPEND VM_SOURCES_WKS ${VM_SOURCES_DAC_AND_WKS_WIN32} marvin32.cpp # move out of win32 when FEATURE_RANDOMIZED_STRING_HASHING is enabled for linux # These should not be included for Linux @@ -294,8 +293,7 @@ set(VM_SOURCES_WKS winrthelpers.cpp ) -set(VM_SOURCES_DAC - ${VM_SOURCES_DAC} +list(APPEND VM_SOURCES_DAC ${VM_SOURCES_DAC_AND_WKS_WIN32} # These should not be included for Linux clrprivbinderwinrt.cpp @@ -358,8 +356,7 @@ set(VM_SOURCES_WKS_AMD64 if(CLR_CMAKE_PLATFORM_UNIX) -set(VM_SOURCES_WKS_AMD64 - ${VM_SOURCES_WKS_AMD64} +list(APPEND VM_SOURCES_WKS_AMD64 ${AMD64_SOURCES_DIR}/unixstubs.cpp ) @@ -371,14 +368,12 @@ set(VM_SOURCES_DAC_AMD64 exceptionhandling.cpp ) -set(VM_SOURCES_WKS - ${VM_SOURCES_WKS} +list(APPEND VM_SOURCES_WKS ${VM_SOURCES_WKS_AMD64} ${VM_SOURCES_DAC_AND_WKS_AMD64} ) -set(VM_SOURCES_DAC - ${VM_SOURCES_DAC} +list(APPEND VM_SOURCES_DAC ${VM_SOURCES_DAC_AMD64} ${VM_SOURCES_DAC_AND_WKS_AMD64} ) diff --git a/src/vm/wks/CMakeLists.txt b/src/vm/wks/CMakeLists.txt index a0d2745f8b..49d45ccc2f 100644 --- a/src/vm/wks/CMakeLists.txt +++ b/src/vm/wks/CMakeLists.txt @@ -16,7 +16,7 @@ foreach(DEFINITION IN LISTS COMPILE_DEFINITIONS_LIST) string(TOUPPER ${CMAKE_MATCH_1} CONFIG) set(ASM_DEFINITIONS_${CONFIG} ${ASM_DEFINITIONS_${CONFIG}} ${CMAKE_MATCH_2}) else() - set(ASM_DEFINITIONS ${ASM_DEFINITIONS} ${DEFINITION}) + list(APPEND ASM_DEFINITIONS ${DEFINITION}) endif() endforeach() |