Skip to content

Commit 24cc3b6

Browse files
committed
Some more clean up
1 parent b24fa23 commit 24cc3b6

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
message("SITEPKG:" @PYTHON_SITE_PACKAGES_PREFIX@)
2-
message("FILES:"@cdat_SOURCE_DIR@/Packages/dat/files.txt)
31
file(READ @cdat_SOURCE_DIR@/Packages/dat/files.txt SAMPLE_FILES)
42
string(REPLACE "\n" ";" SAMPLE_LIST ${SAMPLE_FILES})
53
foreach(SAMPLE_FILE ${SAMPLE_LIST})
64
STRING(REPLACE " " ";" DOWNLOAD_LIST ${SAMPLE_FILE})
75
LIST(GET DOWNLOAD_LIST 0 MD5)
86
LIST(GET DOWNLOAD_LIST 1 FILE_NM)
9-
message("TRYING TO DOWNLOAD http://uv-cdat.llnl.gov/cdat/sample_data/${FILE_NM} WITH MD5 ${MD5} to @PYTHON_SITE_PACKAGES_PREFIX@/sample_data/${FILE_NM}")
7+
message("[INFO] Attempting to download http://uv-cdat.llnl.gov/cdat/sample_data/${FILE_NM} WITH MD5 ${MD5} to @PYTHON_SITE_PACKAGES_PREFIX@/sample_data/${FILE_NM}")
108
file(DOWNLOAD http://uv-cdat.llnl.gov/cdat/sample_data/${FILE_NM} @PYTHON_SITE_PACKAGES_PREFIX@/sample_data/${FILE_NM} EXPECTED_MD5=${MD5})
119
endforeach()
12-
message("DOWNLOAD SUCCESSFUL")
1310
set(res 0)

CMake/cdat_modules_extra/cdat_make_step.cmake.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ include(@cdat_CMAKE_BINARY_DIR@/cdat_common_environment.cmake)
44
if(NOT ${make})
55
set(make make)
66
endif()
7-
message("[INFO CFLGAGS] $ENV{CFLAGS}")
87
execute_process(
98
COMMAND env CFLAGS=$ENV{CFLAGS} LDFLAGS=$ENV{LDFLAGS} CPPFLAGS=$ENV{CPPFLAGS} CXXFLAGS=$ENV{CXXFLAG} ${make} ${BUILD_ARGS}
109
WORKING_DIRECTORY "${WORKING_DIR}"
@@ -13,8 +12,7 @@ execute_process(
1312
RESULT_VARIABLE res)
1413

1514
if(NOT ${res} EQUAL 0)
16-
message("Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
15+
message("[ERROR] Make Errors detected: \n${CDAT_OUT}\n${CDAT_ERR}")
1716
message(FATAL_ERROR "Error in Make")
1817
endif()
19-
message("Make succeeded.")
2018

0 commit comments

Comments
 (0)