OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
342 Commits 18 Branches 75 Tags
1efadb4af2e01fb22915947b7a2e54cc69a2fb6b
Commit Graph

342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
1efadb4af2 Merge remote-tracking branch 'upstream/master' into time-map 2013-10-24 15:25:43 +02:00
Joakim Hove
53ef54225a Merge remote-tracking branch 'upstream/master' 2013-10-24 09:38:57 +02:00
Joakim Hove
54d94d7634 Parser->addKeyword() will erase first; NOW the ReplaceKeyword works 2013-10-24 09:38:03 +02:00
Joakim Hove
f303c09690 Parser->addKeyword() will erase first; NOW the ReplaceKeyword works 2013-10-24 09:37:14 +02:00
Joakim Hove
29a168ee52 Merge pull request #38 from rolk/038_cmake 
Allow directory root to be specified as the rest of the OPM modules
 2013-10-24 00:22:33 -07:00
Joakim Hove
113d488242 Merge pull request #33 from rolk/033_bld 
Support more build configurations
 2013-10-24 00:01:05 -07:00
Roland Kaufmann
940f31295b Test for all the required header directories 2013-10-23 22:40:45 +02:00
Roland Kaufmann
7e9c45b765 Allow package to be specified as required 
Although CMake prefers the uppercase variant variables, and the
find_package_handle_standard_args will convert to them for us, the
part that parses REQUIRED and QUIET arguments to find_package still
only uses the package name verbatim (sic).
 2013-10-23 22:40:45 +02:00
Roland Kaufmann
bb4fffc227 Don't search relative directories if root is given 
The PATHS that are specified is always searched, also if NO_DEFAULT_PATH
is given.
 2013-10-23 22:40:45 +02:00
Roland Kaufmann
8ac1062968 Allow lowercase variables for specifying project root 2013-10-23 22:40:45 +02:00
Roland Kaufmann
b1f6e665c1 Search for headers relative to project root 
The find module may be called from a CMakeLists.txt in a subdirectory,
and it would start the search from there.
 2013-10-23 22:40:45 +02:00
Joakim Hove
dd0676126e Merge remote-tracking branch 'upstream/master' into time-map 2013-10-23 18:15:43 +02:00
Joakim Hove
069cd2b8c9 Merge pull request #35 from rolk/035_cmake 
Provide find module for OPM Parser library
 2013-10-23 07:48:29 -07:00
Roland Kaufmann
173df1f166 Include standard CMake module to get error handling 2013-10-23 14:34:25 +02:00
Roland Kaufmann
8642f5e253 Include standard CMake module to get error handling 2013-10-23 14:32:40 +02:00
Roland Kaufmann
c698136b51 Define uppercase version of found-variable 
It doesn't really matter here because "cjson" is only letters, but as
a general rule we define the uppercase variant ourselves so that CMake
doesn't use its own (bizarre) case rules, and then set the lower case
explicitly afterwards.
 2013-10-23 11:37:16 +02:00
Roland Kaufmann
0cbed21e5a Define uppercase variant when testing for existence 
CMake will do some uppercasing of its own (defining OPM-PARSER_FOUND)
so it works best if we specify the correct uppercase version and sets
the lowercase afterwards.
 2013-10-23 11:35:19 +02:00
Roland Kaufmann
e823803474 Provide find module for OPM Parser library 
Searches for headers and objects of the library as well as finding
the prerequisites (Boost and CJSON) necessary to link a program.
 2013-10-23 11:12:35 +02:00
Roland Kaufmann
d537acf16f Correct documentation typo 2013-10-23 11:06:13 +02:00
Roland Kaufmann
9f8ac9a963 Set plural form of header dir. var. 
Even though we only look for one directory, the convention is to always
have the full set of prerequisites in the plural form.
 2013-10-23 11:05:22 +02:00
Roland Kaufmann
47934fd678 Look in lib64/ for x86_64 libs on RHEL(-like) distro 2013-10-23 10:44:35 +02:00
Roland Kaufmann
9d4cd49427 Use math library as a prerequisite (on Linux) 
It is needed for pow() and floor() functions.
 2013-10-23 10:22:50 +02:00
Roland Kaufmann
2b52adadf2 Search for build tree relative to this project 
The CMake script is run in the source tree. We assume a certain
directory layout and that the cjson is available in a sibling
directory of this project. Thus, we can pick up a build tree without
having the library installed.
 2013-10-23 10:22:50 +02:00
Roland Kaufmann
9663d187a7 Search for library in proper build directory 
The library will end up in the opm/json library in a build tree; we
want to be able to point the CJSON_ROOT variable to the root of the
build tree and have it pick up the libraries from there.
 2013-10-23 10:22:50 +02:00
Roland Kaufmann
1b4a71bdfb Raise error if module is required but not found 
Otherwise the error will just be silently ignored.
 2013-10-23 10:22:49 +02:00
Roland Kaufmann
781ef04a0e Compare size with unsigned int literal 
Surprisingly, some compilers (notably GCC 4.6.3) will issue a warning
when comparing a literal which is clearly positive to an unsigned type,
when looking for a suitable instantiation in Boost. This is fixed by
making the literal unsigned too, so there's no doubt.
 2013-10-22 23:39:49 +02:00
Roland Kaufmann
0a69727bf7 Add missing header for function used inline in class 2013-10-22 22:38:08 +02:00
Joakim Hove
8cc555c5ac Added basic functionality to assemble a timeMap 2013-10-22 17:11:33 +02:00
Joakim Hove
2a09a6b2c1 Added (empty) TimeMap class 2013-10-22 14:24:31 +02:00
Joakim Hove
803304d5f8 Deck->keywordContainer will set deckIndex of DeckKeyword when inserting: Have relaxed const properties of DeckKeyword 2013-10-22 11:42:15 +02:00
Joakim Hove
0598e9122a Added deckIndex property to deckKeyword 2013-10-22 11:40:45 +02:00
Joakim Hove
63fb47515b Relaxed internalParseLarge test 2013-10-22 10:48:39 +02:00
flikka
6ffa9052ef Merge pull request #32 from joakim-hove/reload-keyword 
Added test for replace keyword functionality
 2013-10-18 05:48:06 -07:00
Joakim Hove
1cc16de2bd Added test for replace keyword functionality 2013-10-18 10:17:48 +02:00
Kristian Flikka
65e01082d2 Added tests exposed tracking of default usage 2013-10-16 15:07:54 +02:00
Kristian Flikka
13f30cb3ef Removed template for ParserItem for decoding default/repetetive tokens for String and Double 2013-10-16 14:57:01 +02:00
Joakim Hove
0aa416675a ??? 2013-10-16 09:59:32 +02:00
Joakim Hove
2d68ebe94c Merge remote-tracking branch 'upstream/master' into track-default 2013-10-15 14:24:42 +02:00
Joakim Hove
2ac8bc55a5 Merge pull request #30 from joakim-hove/data-with-space 
Data with space
 2013-10-15 05:23:11 -07:00
Joakim Hove
49ac9f4568 ParserIntItem::scan() implemented with (temporary) specialized code 2013-10-14 21:30:17 +02:00
Joakim Hove
dabfdb922b Added loose function tokenCOntainsStar to StarToken.cpp 2013-10-14 21:27:20 +02:00
Joakim Hove
f38cd79839 Commented out failing DefaultApplied tests 2013-10-14 21:15:57 +02:00
Joakim Hove
9be183cf52 Minor reformat to not confuse comment end marker 2013-10-14 21:14:39 +02:00
Joakim Hove
7ec4be5b47 Including StarTokenTest 2013-10-14 21:13:24 +02:00
Joakim Hove
801e6b9fd1 Added DeckIntItem->push_backMultiple() 2013-10-14 21:12:22 +02:00
Joakim Hove
a7078ba687 Implemented StarToken specializations in cpp file 2013-10-14 21:05:10 +02:00
Joakim Hove
ccae60777d Ensure that StarToken() will throw for missing multiplier 2013-10-14 17:49:07 +02:00
Joakim Hove
aae260c47d Added class StarToken() to treat tokens with a multiplier/default 2013-10-14 16:54:43 +02:00
Joakim Hove
d1f0a9f5f7 Moved some tests around 2013-10-14 14:15:44 +02:00
Joakim Hove
48a0fa39e1 Added DexkXXXItem.push_backDefault() 2013-10-11 16:16:45 +02:00