Skip to content

Commit

Permalink
Merge pull request #18484 from Flamefire/fix-cmake-constants
Browse files Browse the repository at this point in the history
consistently use ON/OFF for -DBUILD_SHARED_LIBS
  • Loading branch information
boegel authored Sep 1, 2023
2 parents 802e83f + bf493e0 commit 800cb09
Show file tree
Hide file tree
Showing 26 changed files with 27 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sources = ['v%(version)s.tar.gz']
checksums = ['1023eb590e2112d5bc213c568a212390fc65ff98732ac8d2ccdda5062e6bc8c6']

builddependencies = [('CMake', '3.16.4')]
configopts = " -DBUILD_STATIC_LIBS=1 -DBUILD_SHARED_LIBS=1"
configopts = '-DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=ON'

sanity_check_paths = {
'files': ['lib/libbufr.a', 'lib/libbufr.so'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ dependencies = [

# build demo
# build static and shared libraries
configopts = ["-DCROSSGUID_TESTS=ON", "-DBUILD_SHARED_LIBS=TRUE"]
configopts = ["-DCROSSGUID_TESTS=ON -DBUILD_SHARED_LIBS=%s" % local_shared for local_shared in ('OFF', 'ON')]

# we want to have the crossguid-test
postinstallcmds = [
Expand Down
3 changes: 2 additions & 1 deletion easybuild/easyconfigs/g/gflags/gflags-2.1.2-foss-2016a.eb
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ toolchainopts = {'pic': True}

sources = ['v%(version)s.tar.gz']
source_urls = ['https://github.com/gflags/gflags/archive/']
checksums = ['d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662']

builddependencies = [
('CMake', '3.4.3'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ builddependencies = [
('CMake', '3.10.2'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/g/gflags/gflags-2.2.1-intel-2017a.eb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ builddependencies = [
('CMake', '3.9.1')
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/g/gflags/gflags-2.2.1-intel-2017b.eb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ builddependencies = [
('CMake', '3.9.1')
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [
('CMake', '3.18.4'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [
('CMake', '3.20.1'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [
('CMake', '3.21.1'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [
('CMake', '3.13.3'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [
('CMake', '3.15.3'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [
('CMake', '3.16.4'),
]

configopts = '-DBUILD_SHARED_LIBS=on -DBUILD_STATIC_LIBS=on'
configopts = '-DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON'

sanity_check_paths = {
'files': ['bin/gflags_completions.sh'] +
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ builddependencies = [('CMake', '3.13.3')]

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=TRUE']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

runtest = 'check'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ builddependencies = [
('CMake', '3.23.1'),
]

configopts = '-DBUILD_SHARED_LIBS=1'
configopts = '-DBUILD_SHARED_LIBS=ON'

sanity_check_paths = {
'files': ['bin/mctc-convert', 'lib/libmctc-lib.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies = [
('mctc-lib', '0.3.1'),
]

configopts = '-DBUILD_SHARED_LIBS=1'
configopts = '-DBUILD_SHARED_LIBS=ON'

sanity_check_paths = {
'files': ['bin/mstore-fortranize', 'bin/mstore-info', 'lib/libmstore.%s' % SHLIB_EXT],
Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/n/NTPoly/NTPoly-2.5.1-foss-2020b.eb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source_urls = ['https://github.com/william-dawson/NTPoly/archive/ntpoly-v%(versi
sources = [SOURCELOWER_TAR_GZ]
checksums = ['5d1abd3dc3286167caf0c326ef14838ac8360aa1e912bd7bd6d212259fbff1ac']

configopts = ['-DBUILD_SHARED_LIBS=on']
configopts = '-DBUILD_SHARED_LIBS=ON'

builddependencies = [('CMake', '3.18.4')]

Expand Down
2 changes: 1 addition & 1 deletion easybuild/easyconfigs/n/NTPoly/NTPoly-2.5.1-intel-2020b.eb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source_urls = ['https://github.com/william-dawson/NTPoly/archive/ntpoly-v%(versi
sources = [SOURCELOWER_TAR_GZ]
checksums = ['5d1abd3dc3286167caf0c326ef14838ac8360aa1e912bd7bd6d212259fbff1ac']

configopts = ['-DBUILD_SHARED_LIBS=on']
configopts = '-DBUILD_SHARED_LIBS=ON'

builddependencies = [('CMake', '3.18.4')]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ builddependencies = [

separate_build_dir = True

configopts = ['', '-DBUILD_SHARED_LIBS=true']
configopts = ['-DBUILD_SHARED_LIBS=OFF', '-DBUILD_SHARED_LIBS=ON']

sanity_check_paths = {
'files': ['include/utf8proc.h', 'lib/libutf8proc.a', 'lib/libutf8proc.%s' % SHLIB_EXT],
Expand Down

0 comments on commit 800cb09

Please sign in to comment.