Gtkorvo updates (#8663)
* gtkorvo-atl: Updated to version 2.2 * gtkorvo-dill: Updated to version 2.4 * gtkorvo-enet: Updated to version 1.3.14 * libevpath: Updated to version 4.4.0 * libffs: Updated to version 1.5 * gtkorvo-atl: Bugfix: Fixed cmake args * gtkorvo-enet: Switched order of versions to have the latest version on the top * gtkorvo-atl: Cleaned up cmake_args. Added conditional self.run_tests * gtkorvo-dill: Cleaned up cmake_args. Added conditional self.run_tests * libffs: Correction in dependency versions. Cleaned up cmake_args. Added conditional self.run_tests * libevpath: Correction in dependency versions. Cleaned up cmake_args. Added conditional self.run_tests * gtkorvo-atl: Removed unused option from cmake args
This commit is contained in:

committed by
Adam J. Stewart

parent
90042749e8
commit
3c4ef576d9
@@ -38,16 +38,26 @@ class Libffs(CMakePackage):
|
||||
|
||||
version('develop', git='https://github.com/GTkorvo/ffs.git',
|
||||
branch='master')
|
||||
version('1.5', 'c41c5f5f448b627740deecd695b7bbf8')
|
||||
version('1.1.1', 'aa1c8ad5cf35e8cf76735e3a60891509')
|
||||
version('1.1', '561c6b3abc53e12b3c01192e8ef2ffbc')
|
||||
|
||||
depends_on('flex')
|
||||
depends_on('bison')
|
||||
depends_on('flex', type='build', when='@:1.4')
|
||||
depends_on('bison', type='build', when='@:1.4')
|
||||
depends_on('gtkorvo-cercs-env', type='build', when='@:1.4')
|
||||
depends_on('gtkorvo-atl')
|
||||
depends_on('gtkorvo-dill')
|
||||
depends_on('gtkorvo-cercs-env')
|
||||
|
||||
def cmake_args(self):
|
||||
args = ["-DENABLE_TESTING=0", "-DTARGET_CNL=1",
|
||||
"-DBUILD_SHARED_STATIC=STATIC"]
|
||||
args = ["-DTARGET_CNL=1"]
|
||||
if self.spec.satisfies('@1.5:'):
|
||||
args.append("-DBUILD_SHARED_LIBS=OFF")
|
||||
else:
|
||||
args.append("-DENABLE_BUILD_STATIC=STATIC")
|
||||
|
||||
if self.run_tests:
|
||||
args.append('-DENABLE_TESTING=0')
|
||||
else:
|
||||
args.append('-DENABLE_TESTING=0')
|
||||
|
||||
return args
|
||||
|
Reference in New Issue
Block a user