Kaydet (Commit) ff69e725 authored tarafından Michael Stahl's avatar Michael Stahl

normalize values of SYSTEM_GLM, SYSTEM_VIGRA

Change-Id: Idc28f8be610aae57477f18c26ffcb97a24a2ab82
üst 5866b33b
...@@ -92,7 +92,7 @@ endef ...@@ -92,7 +92,7 @@ endef
endif endif
ifeq ($(SYSTEM_VIGRA),YES) ifneq ($(SYSTEM_VIGRA),)
gb_LinkTarget__use_vigra_headers := gb_LinkTarget__use_vigra_headers :=
...@@ -126,7 +126,7 @@ endef ...@@ -126,7 +126,7 @@ endef
endif # SYSTEM_MDDS endif # SYSTEM_MDDS
ifeq ($(SYSTEM_GLM),YES) ifneq ($(SYSTEM_GLM),)
gb_LinkTarget__use_glm_headers := gb_LinkTarget__use_glm_headers :=
......
...@@ -8798,7 +8798,7 @@ dnl =================================================================== ...@@ -8798,7 +8798,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which glm to use]) AC_MSG_CHECKING([which glm to use])
if test "$with_system_glm" = "yes"; then if test "$with_system_glm" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_GLM=YES SYSTEM_GLM=TRUE
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
AC_CHECK_HEADER([glm/glm.hpp], [], AC_CHECK_HEADER([glm/glm.hpp], [],
[AC_MSG_ERROR([glm/glm.hpp not found. install glm])], []) [AC_MSG_ERROR([glm/glm.hpp not found. install glm])], [])
...@@ -8806,7 +8806,7 @@ if test "$with_system_glm" = "yes"; then ...@@ -8806,7 +8806,7 @@ if test "$with_system_glm" = "yes"; then
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE GLM" BUILD_TYPE="$BUILD_TYPE GLM"
SYSTEM_GLM=NO SYSTEM_GLM=
fi fi
AC_SUBST([SYSTEM_GLM]) AC_SUBST([SYSTEM_GLM])
...@@ -8821,7 +8821,7 @@ dnl =================================================================== ...@@ -8821,7 +8821,7 @@ dnl ===================================================================
AC_MSG_CHECKING([which vigra to use]) AC_MSG_CHECKING([which vigra to use])
if test "$with_system_vigra" = "yes"; then if test "$with_system_vigra" = "yes"; then
AC_MSG_RESULT([external]) AC_MSG_RESULT([external])
SYSTEM_VIGRA=YES SYSTEM_VIGRA=TRUE
AC_LANG_PUSH([C++]) AC_LANG_PUSH([C++])
AC_CHECK_HEADER(vigra/copyimage.hxx, [], AC_CHECK_HEADER(vigra/copyimage.hxx, [],
[AC_MSG_ERROR(vigra/copyimage.hxx not found. install vigra)], []) [AC_MSG_ERROR(vigra/copyimage.hxx not found. install vigra)], [])
...@@ -8829,7 +8829,7 @@ if test "$with_system_vigra" = "yes"; then ...@@ -8829,7 +8829,7 @@ if test "$with_system_vigra" = "yes"; then
else else
AC_MSG_RESULT([internal]) AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE VIGRA" BUILD_TYPE="$BUILD_TYPE VIGRA"
SYSTEM_VIGRA=NO SYSTEM_VIGRA=
fi fi
AC_SUBST(SYSTEM_VIGRA) AC_SUBST(SYSTEM_VIGRA)
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,glm)) $(eval $(call gb_Module_Module,glm))
ifeq ($(SYSTEM_GLM),NO) ifeq ($(SYSTEM_GLM),)
$(eval $(call gb_Module_add_targets,glm,\ $(eval $(call gb_Module_add_targets,glm,\
UnpackedTarball_glm \ UnpackedTarball_glm \
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
$(eval $(call gb_Module_Module,vigra)) $(eval $(call gb_Module_Module,vigra))
ifeq ($(SYSTEM_VIGRA),NO) ifeq ($(SYSTEM_VIGRA),)
$(eval $(call gb_Module_add_targets,vigra,\ $(eval $(call gb_Module_add_targets,vigra,\
UnpackedTarball_vigra \ UnpackedTarball_vigra \
......
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