diff options
Diffstat (limited to 'connectivity/Module_connectivity.mk')
| -rw-r--r-- | connectivity/Module_connectivity.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk index beb34bdc3c5b..ab3a4513094f 100644 --- a/connectivity/Module_connectivity.mk +++ b/connectivity/Module_connectivity.mk @@ -45,8 +45,9 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_file \ Library_flat \ Library_mysql \ - Library_odbc \ - Library_odbcbase \ + $(if $(filter ANDROID IOS,$(OS)),, \ + Library_odbc \ + Library_odbcbase) \ Library_sdbc2 \ Package_generated \ Package_inc \ @@ -129,7 +130,7 @@ $(eval $(call gb_Module_add_targets,connectivity,\ )) endif -else ifneq ($(filter-out ANDROID IOS,$(OS)),) +else ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) $(eval $(call gb_Module_add_targets,connectivity,\ Configuration_mork \ @@ -137,6 +138,10 @@ $(eval $(call gb_Module_add_targets,connectivity,\ Library_mork \ )) +$(eval $(call gb_Module_add_check_targets,connectivity,\ + CppunitTest_connectivity_mork \ +)) + endif ifneq ($(filter QADEVOOO,$(BUILD_TYPE)),) @@ -144,7 +149,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,connectivity,\ Jar_ConnectivityTools \ )) # FIXME: Does not work. Convert to JUnit. - # JunitTest_complex \ +# JunitTest_complex \ endif |