Kaydet (Commit) 84cbd415 authored tarafından Caolán McNamara's avatar Caolán McNamara

we now get a solver lib even without lpsolve or coinmp

Change-Id: I867d9aa37f876532dd67dadff7cd76f6e35868ba
Reviewed-on: https://gerrit.libreoffice.org/44912Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 5280b3ea
......@@ -255,7 +255,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,calc, \
scfilt \
scui \
wpftcalc \
$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),solver) \
solver \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
))
......@@ -1082,7 +1082,7 @@ $(eval $(call gb_Helper_register_mos,\
$(call gb_Helper_optional,SCRIPTING,sb) \
sc \
sca \
$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE),scc) \
scc \
sd \
sfx \
sm \
......
......@@ -631,6 +631,7 @@ darwin*) # Mac OS X or iOS
test_cups=no
enable_mpl_subset=yes
enable_lotuswordpro=no
enable_coinmp=no
enable_lpsolve=no
enable_postgresql_sdbc=no
enable_extension_integration=no
......
......@@ -20,11 +20,11 @@
$(eval $(call gb_Module_Module,sccomp))
$(eval $(call gb_Module_add_targets,sccomp,\
$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE), Library_solver) \
Library_solver \
))
$(eval $(call gb_Module_add_l10n_targets,sccomp,\
$(if $(ENABLE_COINMP)$(ENABLE_LPSOLVE), AllLangMoTarget_scc) \
AllLangMoTarget_scc \
))
$(eval $(call gb_Module_add_check_targets,sccomp,\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment