3185 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Charlton, Scott R	e89e3ae14a	added missing cd command	2020-10-21 12:17:23 -06:00
Charlton, Scott R	f521ea9f98	updated jenkins-dist.sh for using-cmake example	2020-09-29 16:51:51 -06:00
Charlton, Scott R	7cada4e12d	updated using-cmake README.txt	2020-09-29 16:49:15 -06:00
Darth Vader	7797f6ed98	Merge commit '055ebf5c1ffe61bba8b37743f1bddd93007131b9'	2020-09-29 22:14:55 +00:00
Darth Vader	055ebf5c1f	Merge commit '2b4dbbdb167b77809e7c89bbec406810aa28162a'	2020-09-29 22:14:23 +00:00
Darth Vader	2b4dbbdb16	Merge commit 'cd51d8aeed46909e5f028a19089acfef43d6ede9'	2020-09-29 22:13:38 +00:00
Darth Vader	a18dfa35a0	Merge commit '589d88ff89b061b46289530165ad032642fbdaa4'	2020-09-29 22:13:03 +00:00
Darth Vader	589d88ff89	Merge commit 'f2023c4d83f55cbf4598ae8e308df3ef06b8f08c'	2020-09-29 22:12:01 +00:00
Darth Vader	a3dc6d20d3	Merge commit 'f4bf55d7bf26ca64edec1836ca4d2708427962ce'	2020-09-29 22:11:36 +00:00
Charlton, Scott R	f2023c4d83	Merge branch 'gtest' into 'master' ... Reset dllexport; fixed doxygen example tests See merge request coupled/iphreeqc!19	2020-09-29 22:09:46 +00:00
Charlton, Scott R	f4bf55d7bf	Merge branch 'gtest' into 'master' ... Reset dllexport; fixed doxygen example tests See merge request coupled/iphreeqc!19	2020-09-29 22:09:46 +00:00
Charlton, Scott R	6d01aab759	Merge branch 'gtest' into 'master' ... Reset dllexport; fixed doxygen example tests See merge request coupled/iphreeqc!19	2020-09-29 22:09:46 +00:00
Charlton, Scott R	20c11bc17e	IPhreeqc_interface must be compiled first	2020-09-29 16:05:52 -06:00
Charlton, Scott R	cd51d8aeed	reset for dlls	2020-09-29 10:27:55 -06:00
Charlton, Scott R	54161f4ae3	reset for dlls	2020-09-29 10:27:55 -06:00
Charlton, Scott R	a28c241478	reset for dlls	2020-09-29 10:27:55 -06:00
Charlton, Scott R	f7d7fef7a0	reset for dlls	2020-09-29 10:27:55 -06:00
Darth Vader	3cf119c58a	Merge commit 'e904f5b730e622046aedacf704a6e888654c7517'	2020-09-24 04:31:32 +00:00
Darth Vader	e904f5b730	Merge commit '01c99a70a5baf72d53ae8e8f6db53948ddcd990c'	2020-09-24 04:29:35 +00:00
Charlton, Scott R	01c99a70a5	Merge remote-tracking branch 'github/master'	2020-09-23 22:25:35 -06:00
David Parkhurst	23f391743a	Merge remote-tracking branch 'scharlton2/master'	2020-09-23 15:49:19 -06:00
David Parkhurst	f6644e6e34	check for null pointer. Encoding for .out file	2020-09-23 15:47:05 -06:00
Charlton, Scott R	6ee61b9c21	Merge branch 'gtest' into 'master' ... Changed POST_BUILD to PRE_BUILD for when to copy dlls See merge request coupled/iphreeqc!18	2020-09-22 20:54:27 +00:00
Charlton, Scott R	d4bc4b30a0	Changed POST_BUILD to PRE_BUILD for when to copy dlls	2020-09-21 21:24:00 -06:00
Charlton, Scott R	dcac7dd759	Merge branch 'gtest' into 'master' ... added gtest to dist See merge request coupled/iphreeqc!17	2020-09-21 00:52:12 +00:00
Charlton, Scott R	0b3002ad87	added gtest to dist	2020-09-20 18:49:25 -06:00
Charlton, Scott R	7423ec64d6	added gtest_discover_tests	2020-09-18 16:37:20 -06:00
Darth Vader	2ddf3ef853	Merge commit 'e562e09e9ae00671933f9800a302629f50d945dc'	2020-09-17 06:12:28 +00:00
Darth Vader	e562e09e9a	Merge commit '9319c9daf8fe76ef24cf4d262081e8cd0c8fc3fe'	2020-09-17 06:11:12 +00:00
Darth Vader	dd9cd0ef4c	Merge commit 'ea2c663c90fe84a9c191eac91286bb2afed4bd15'	2020-09-17 06:10:31 +00:00
Darth Vader	9319c9daf8	Merge commit '5b816fa1fd82eb94e2702b6bd9df6066fb71267b'	2020-09-17 06:10:18 +00:00
Darth Vader	ea2c663c90	Merge commit '07717b1e931b4526f3c33921cd872577599410b6'	2020-09-17 06:09:05 +00:00
Darth Vader	5cc3d6af14	Merge commit '0b0fced395d40a23a1eb8514688a812c13e4db02'	2020-09-17 06:08:08 +00:00
Charlton, Scott R	19a4576e67	Merge branch 'gtest' into 'master' ... Updated cmake build See merge request coupled/iphreeqc!16	2020-09-17 06:05:12 +00:00
Charlton, Scott R	089e872532	Added using-cmake files to automake files	2020-09-16 22:48:15 -07:00
Charlton, Scott R	dbba3f26dc	implemented SOVERSION for shared libs	2020-09-16 21:40:45 -07:00
Charlton, Scott R	5b816fa1fd	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	07717b1e93	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	0b0fced395	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	3091de68dd	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	093f8e99ca	reverted IPhreeqc_SRC mistake	2020-09-15 16:48:46 -06:00
Charlton, Scott R	95dded5cf3	added missing CMakeLists.txt.in	2020-09-14 14:26:24 -07:00
Charlton, Scott R	03c40d1f51	added default build type	2020-09-14 14:12:59 -07:00
Charlton, Scott R	bf17f90d8e	added newline	2020-09-11 19:44:28 -07:00
Charlton, Scott R	1d14855a15	turned off gmock build; reformatted	2020-09-11 18:36:53 -07:00
Charlton, Scott R	033f89bcfc	updated to not use gmock	2020-09-11 17:28:55 -06:00
Charlton, Scott R	aa178fd6fa	cleanup and added some gmock tests; gmock and BUILD_SHARED_LIBS seem to be incompatible (at least with gtest 1.8.1)	2020-09-11 16:35:28 -06:00
Charlton, Scott R	d8c638fba3	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00
Charlton, Scott R	c8be5daebc	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00
Charlton, Scott R	46d8cf8a96	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00