[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52110] trunk/blender/CMakeLists.txt: revert muddle in changing jack in msvc instead apple
jens verwiebe
info at jensverwiebe.de
Sun Nov 11 19:28:45 CET 2012
Revision: 52110
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52110
Author: jensverwiebe
Date: 2012-11-11 18:28:45 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
revert muddle in changing jack in msvc instead apple
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2012-11-11 18:26:39 UTC (rev 52109)
+++ trunk/blender/CMakeLists.txt 2012-11-11 18:28:45 UTC (rev 52110)
@@ -1079,13 +1079,11 @@
endif()
if(WITH_JACK)
- find_library(JACK_FRAMEWORK
- NAMES jackmp
+ set(JACK_INCLUDE_DIRS
+ ${LIBDIR}/jack/include/jack
+ ${LIBDIR}/jack/include
)
- set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
- if(NOT JACK_FRAMEWORK)
- set(WITH_JACK OFF)
- endif()
+ set(JACK_LIBRARIES ${LIBDIR}/jack/lib/libjack.lib)
endif()
if(WITH_PYTHON)
@@ -1358,10 +1356,13 @@
endif()
if(WITH_JACK)
- set(JACK /usr/local)
- set(JACK_INCLUDE_DIRS ${JACK}/include/jack)
- set(JACK_LIBRARIES jack)
- set(JACK_LIBPATH ${JACK}/lib)
+ find_library(JACK_FRAMEWORK
+ NAMES jackmp
+ )
+ set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
+ if(NOT JACK_FRAMEWORK)
+ set(WITH_JACK OFF)
+ endif()
endif()
if(WITH_CODEC_SNDFILE)
More information about the Bf-blender-cvs
mailing list