From ce6d37c593b1ba9c23cad05228bd1f57b50d5ccc Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Mon, 29 May 2023 03:21:02 +0000 Subject: [PATCH] Squashed 'examples/com/' changes from a68a1861..3ed6cb65 3ed6cb65 Updated for phreeqc changes Introduce end-of-line normalization for CMakeLists.txt git-subtree-dir: examples/com git-subtree-split: 3ed6cb654ab872b3a516d8414c0f21a2e3e584e5 --- CMakeLists.txt | 20 ++++++++++---------- excel/CMakeLists.txt | 21 +++++++++------------ python/CMakeLists.txt | 25 +++++++++++-------------- 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 518e47ce..6677cbed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ -add_subdirectory(excel) -add_subdirectory(python) - -SET(COM_Files -README.txt -) - -SET(COM_Dir ${EXAMPLES_DIR}/com) - -install(FILES ${COM_Files} DESTINATION ${COM_Dir}) +add_subdirectory(excel) +add_subdirectory(python) + +SET(COM_Files +README.txt +) + +SET(COM_Dir ${EXAMPLES_DIR}/com) + +install(FILES ${COM_Files} DESTINATION ${COM_Dir}) diff --git a/excel/CMakeLists.txt b/excel/CMakeLists.txt index c249a451..85c067c7 100644 --- a/excel/CMakeLists.txt +++ b/excel/CMakeLists.txt @@ -1,12 +1,9 @@ -SET(Excel_Files -phreeqc.dat -runphreeqc.xls -withcallback.xls -) - -SET(Excel_Dir ${EXAMPLES_DIR}/com/excel) - -install(FILES ${Excel_Files} DESTINATION ${Excel_Dir}) - - - +SET(Excel_Files +phreeqc.dat +runphreeqc.xls +withcallback.xls +) + +SET(Excel_Dir ${EXAMPLES_DIR}/com/excel) + +install(FILES ${Excel_Files} DESTINATION ${Excel_Dir}) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index 60a2c5bd..557b24a7 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -1,14 +1,11 @@ -SET(Python_Files -Gypsum.py -parallel_advect.py -phreeqc.dat -pitzer.dat -wateq4f.dat -) - -SET(Python_Dir ${EXAMPLES_DIR}/com/python) - -install(FILES ${Python_Files} DESTINATION ${Python_Dir}) - - - +SET(Python_Files +Gypsum.py +parallel_advect.py +phreeqc.dat +pitzer.dat +wateq4f.dat +) + +SET(Python_Dir ${EXAMPLES_DIR}/com/python) + +install(FILES ${Python_Files} DESTINATION ${Python_Dir})