-
-
Notifications
You must be signed in to change notification settings - Fork 55.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Removed hard-coded version from integration test.
Documented how to change the version of Maven to match OpenCV core and modified bash scripts accordingly. Extracted integration test module and placed into own profile. Configured CMake Maven plugin to use native CMake by default. Updated documentation.
- Loading branch information
Showing
8 changed files
with
100 additions
and
29 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
**/*.iml | ||
.idea/ | ||
**/*.versionsBackup |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#!/bin/bash | ||
############################################################### | ||
# | ||
# Defines some common functions. | ||
# | ||
# Kerry Billingham <contact [At] AvionicEngineers.{com]> | ||
# | ||
############################################################## | ||
majorHashDefine="#define CV_VERSION_MAJOR" | ||
minorHashDefine="#define CV_VERSION_MINOR" | ||
revisionHashDefine="#define CV_VERSION_REVISION" | ||
statusHashDefine="#define CV_VERSION_STATUS" | ||
versionHeader="../../../../modules/core/include/opencv2/core/version.hpp" | ||
|
||
function extract_version() { | ||
minorVersion=$(grep "${minorHashDefine}" $versionHeader | grep -o ".$") | ||
majorVersion=$(grep "${majorHashDefine}" $versionHeader | grep -o ".$") | ||
revision=$(grep "${revisionHashDefine}" $versionHeader | grep -o ".$") | ||
|
||
REPLY="${majorVersion}.${minorVersion}.${revision}" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters