Skip to content

Commit

Permalink
- Disable OpenCL if not found
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14609 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
sjoelund committed Jan 1, 2013
1 parent 20e29af commit 3cf7975
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.common
Expand Up @@ -92,7 +92,7 @@ fmiclean:
$(MAKE) -C SimulationRuntime/fmi/import/ -f $(defaultMakefileTarget) clean

opencl_rt:
ifeq "$(OSTYPE)" "darwin"
ifeq "$(OPENCL)" "Yes"
else
$(MAKE) -C SimulationRuntime/ParModelica/OpenCLRuntime -f $(defaultMakefileTarget)
endif
Expand Down
1 change: 1 addition & 0 deletions Makefile.in
Expand Up @@ -11,6 +11,7 @@ datadir = @datadir@
docdir = @docdir@
CMAKE = CC=$(CC) CXX=$(CXX) cmake
CMAKE_TARGET = "Unix Makefiles"
OPENCL = @OPENCL@

defaultMakefileTarget = Makefile
QMAKE=@QMAKE@
Expand Down
7 changes: 7 additions & 0 deletions configure.in
Expand Up @@ -25,6 +25,7 @@ AC_SUBST(CORBA_QMAKE_INCLUDES)
AC_SUBST(CORBACFLAGS)
AC_SUBST(CORBALIBS)
AC_SUBST(IDLCMD)
AC_SUBST(OPENCL)
AC_SUBST(IDLPYTHONCMD)
AC_SUBST(USE_MODPAR)
AC_SUBST(BOOSTHOME)
Expand Down Expand Up @@ -498,6 +499,12 @@ else
AC_MSG_RESULT([yes])
fi

AC_MSG_CHECKING([for OpenCL])
AC_CHECK_HEADER([CL/cl.h],[OPENCL="Yes"],[
AC_CHECK_HEADER([OpenCL/cl.h],[OPENCL="Yes"],[OPENCL="No"])
])
FINAL_MESSAGES="$FINAL_MESSAGES\nParModelica: $OPENCL"

dnl Check for Qt

AC_CHECK_PROGS(QMAKE,qmake-qt4 qmake-mac qmake,"")
Expand Down

0 comments on commit 3cf7975

Please sign in to comment.