From 22172198eb9728ffe8c7ae0feced40042f08d42c Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 15 Jun 2012 15:53:10 -0400 Subject: [PATCH 1/2] Add legal header notice template --- CMakeLists.txt | 11 +++++++++++ sr_port/msg.cmake | 10 ++++++++++ sr_port/tttgen.cmake | 10 ++++++++++ 3 files changed, 31 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b789b20..fa11aa7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,14 @@ +################################################################# +# # +# Copyright 2012 Fidelity Information Services, Inc # +# # +# This source code contains the intellectual property # +# of its copyright holder(s), and is made available # +# under a license. If you do not know the terms of # +# the license, please stop and do not read further. # +# # +################################################################# + # CMake 2.8.4 introduced LINK_DEPENDS target property # CMake 2.8.4 introduced generator expressions in custom commands # CMake 2.8.5 introduced use of C compiler as the assembler diff --git a/sr_port/msg.cmake b/sr_port/msg.cmake index 6e69ccb..91973af 100644 --- a/sr_port/msg.cmake +++ b/sr_port/msg.cmake @@ -1,3 +1,13 @@ +################################################################# +# # +# Copyright 2012 Fidelity Information Services, Inc # +# # +# This source code contains the intellectual property # +# of its copyright holder(s), and is made available # +# under a license. If you do not know the terms of # +# the license, please stop and do not read further. # +# # +################################################################# set(ENV{gtm_dist} "${gtm_dist}") set(ENV{gtmroutines} ".") execute_process( diff --git a/sr_port/tttgen.cmake b/sr_port/tttgen.cmake index 84eb30e..ce06878 100644 --- a/sr_port/tttgen.cmake +++ b/sr_port/tttgen.cmake @@ -1,3 +1,13 @@ +################################################################# +# # +# Copyright 2012 Fidelity Information Services, Inc # +# # +# This source code contains the intellectual property # +# of its copyright holder(s), and is made available # +# under a license. If you do not know the terms of # +# the license, please stop and do not read further. # +# # +################################################################# set(ENV{gtm_dist} "${gtm_dist}") set(ENV{gtmroutines} ".") execute_process( From 43ee63fc02a3e14428905fc8bd36547ac9d8ea7d Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 15 Jun 2012 15:53:45 -0400 Subject: [PATCH 2/2] Rename arch_path -> gt_src_list to look like comlist.mk --- CMakeLists.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fa11aa7..7f7e124 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,16 +56,16 @@ add_definitions( ) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG) -set(arch_path) +set(gt_src_list) if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") - list(APPEND arch_path sr_linux) + list(APPEND gt_src_list sr_linux) if("${CMAKE_SIZEOF_VOID_P}" EQUAL 4) - list(APPEND arch_path sr_i386 sr_x86_regs sr_unix_nsb) + list(APPEND gt_src_list sr_i386 sr_x86_regs sr_unix_nsb) else() - list(APPEND arch_path sr_x86_64 sr_x86_regs) + list(APPEND gt_src_list sr_x86_64 sr_x86_regs) endif() endif() -list(APPEND arch_path +list(APPEND gt_src_list sr_unix_gnp sr_unix_cm sr_unix @@ -74,7 +74,7 @@ list(APPEND arch_path ) set(includes) -foreach(d ${arch_path}) +foreach(d ${gt_src_list}) list(APPEND includes ${GTM_SOURCE_DIR}/${d}) endforeach() include_directories(${includes}) @@ -82,7 +82,7 @@ include_directories(${GTM_BINARY_DIR}) function(select_file src_var name) set(found "") - foreach(d ${arch_path}) + foreach(d ${gt_src_list}) set(src "${GTM_SOURCE_DIR}/${d}/${name}") if(EXISTS "${src}") set(found "${src}") @@ -95,7 +95,7 @@ function(select_file src_var name) set("${src_var}" "${found}" PARENT_SCOPE) endfunction() -foreach(d ${arch_path}) +foreach(d ${gt_src_list}) file(GLOB sources_${d} RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/${d} ${d}/*.c ${d}/*.s ${d}/*.si) endforeach() @@ -103,7 +103,7 @@ endforeach() macro(set_source_list target) foreach(name ${ARGN}) set(src "") - foreach(d ${arch_path}) + foreach(d ${gt_src_list}) if(";${sources_${d}};" MATCHES ";(${name}\\.(c|s|si));") set(src ${d}/${CMAKE_MATCH_1}) set("source_used_${CMAKE_MATCH_1}" 1) @@ -159,7 +159,7 @@ set_source_list(semstat2 semstat2) #----------------------------------------------------------------------------- # libmumps gets leftover sources, so compute the remaining list. set(libmumps_SOURCES "") -foreach(d ${arch_path}) +foreach(d ${gt_src_list}) foreach(s ${sources_${d}}) if(NOT source_used_${s}) list(APPEND libmumps_SOURCES ${d}/${s})