Skip to content

Commit

Permalink
CMAKE_BUILD_TYPE is Debug, Release or RelWithDebInfo. mysql_release i…
Browse files Browse the repository at this point in the history
…s BUILD_CONFIG.

Use cmake --build . , like the cmake intro documentation says.

Don't waste IO building a package that we never user.
  • Loading branch information
grooverdan committed Nov 28, 2023
1 parent c88d89d commit 35f30c8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions master-nonlatent/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -859,11 +859,10 @@ f_macos.addStep(
"sh",
"-c",
util.Interpolate(
"cmake . -DCMAKE_BUILD_TYPE=mysql_release -DWITH_JEMALLOC=/usr/local/opt/jemalloc -DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_SPIDER=YES -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=%(kw:perf_schema)s -DPLUGIN_SPHINX=NO %(kw:additional_args)s && make %(kw:verbose_build)s -j%(kw:jobs)s %(kw:create_package)s",
"cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_JEMALLOC=/usr/local/opt/jemalloc -DPLUGIN_TOKUDB=NO -DPLUGIN_MROONGA=NO -DPLUGIN_SPIDER=YES -DPLUGIN_OQGRAPH=NO -DPLUGIN_PERFSCHEMA=%(kw:perf_schema)s -DPLUGIN_SPHINX=NO %(kw:additional_args)s && cmake --build . %(kw:verbose_build)s --parallel %(kw:jobs)s",
perf_schema=util.Property("perf_schema", default="YES"),
jobs=util.Property("jobs", default="$(getconf _NPROCESSORS_ONLN)"),
additional_args=util.Property("additional_args", default=""),
create_package=util.Property("create_package", default="package"),
verbose_build=util.Property("verbose_build", default=""),
),
],
Expand Down

0 comments on commit 35f30c8

Please sign in to comment.