diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-11 23:11:21 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2013-04-13 01:54:41 -0400 |
| commit | 4d9c2fb1e0d94fb205a32bb92c709178700aaaf4 (patch) | |
| tree | 0db6e3ea7c7f0cd289faf1c5c01842be61958a70 | |
| parent | f4f455c8882d858298b4e72a8801b2973f82656e (diff) | |
Get sc to build.
Change-Id: Ia5a73ec2acd3663a35632f268b59c0646cd356ea
| -rw-r--r-- | RepositoryExternal.mk | 11 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_filters_test.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_subsequent_export_test.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_subsequent_filters_test.mk | 1 | ||||
| -rw-r--r-- | sc/CppunitTest_sc_ucalc.mk | 1 | ||||
| -rw-r--r-- | sc/Library_scfilt.mk | 1 |
6 files changed, 16 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 927a123e9ace..1dcb377ce59e 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2295,6 +2295,10 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ orcus \ )) +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ + orcus-parser \ +)) + define gb_LinkTarget__use_orcus $(call gb_LinkTarget_use_unpacked,$(1),orcus) $(call gb_LinkTarget_set_include,$(1),\ @@ -2310,6 +2314,13 @@ $(if $(filter YES,$(SYSTEM_BOOST)), \ endef +define gb_LinkTarget__use_orcus-parser +$(call gb_LinkTarget_use_static_libraries,$(1),\ + orcus-parser \ +) + +endef + endif # SYSTEM_LIBORCUS diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index a3235e65173f..521b6e05cfaa 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \ diff --git a/sc/CppunitTest_sc_subsequent_export_test.mk b/sc/CppunitTest_sc_subsequent_export_test.mk index e63caf2a9116..56fd35d38094 100644 --- a/sc/CppunitTest_sc_subsequent_export_test.mk +++ b/sc/CppunitTest_sc_subsequent_export_test.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \ diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk index a200dac23094..f6ea8626d69a 100644 --- a/sc/CppunitTest_sc_subsequent_filters_test.mk +++ b/sc/CppunitTest_sc_subsequent_filters_test.mk @@ -35,6 +35,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \ diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk index 00dc94237c00..3ee4a5795830 100644 --- a/sc/CppunitTest_sc_ucalc.mk +++ b/sc/CppunitTest_sc_ucalc.mk @@ -45,6 +45,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\ boost_headers \ mdds_headers \ orcus \ + orcus-parser \ )) $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \ diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk index 5c8c8ef1282a..dfb98f75613a 100644 --- a/sc/Library_scfilt.mk +++ b/sc/Library_scfilt.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Library_use_libraries,scfilt,\ $(eval $(call gb_Library_use_externals,scfilt,\ orcus \ + orcus-parser \ zlib \ )) |