diff -ur csound5~/Opcodes/stk/CMakeLists.txt csound5/Opcodes/stk/CMakeLists.txt --- csound5~/Opcodes/stk/CMakeLists.txt 2012-02-20 12:48:56.000000000 +0100 +++ csound5/Opcodes/stk/CMakeLists.txt 2012-02-20 12:49:25.000000000 +0100 @@ -3,9 +3,19 @@ if(BUILD_STK_OPCODES) find_library(STK_LIBRARY stk) if(STK_LIBRARY) - make_plugin(stk-ops stkOpcodes.cpp "stk") - set_target_properties(stk-ops PROPERTIES - OUTPUT_NAME stk) + find_path(STK_INCLUDE_DIR Stk.h + /usr/include/stk + /usr/local/include/stk) + + check_deps(BUILD_STK_OPCODES STK_INCLUDE_DIR) + if(STK_INCLUDE_DIR) + include_directories(${STK_INCLUDE_DIR}) + + make_plugin(stk-ops stkOpcodes.cpp "stk") + + set_target_properties(stk-ops PROPERTIES + OUTPUT_NAME stk) + endif() else() set(stk_srcs src/InetWvIn.cpp src/InetWvOut.cpp @@ -21,7 +31,10 @@ find_file(STK_FOUND NAMES src/InetWvIn.cpp HINTS ${CMAKE_CURRENT_SOURCE_DIR}) - check_deps(BUILD_STK_OPCODES STK_FOUND) + + find_path(STK_INCLUDE_DIR Stk.h ./include) + + check_deps(BUILD_STK_OPCODES STK_FOUND STK_INCLUDE_DIR) if(BUILD_STK_OPCODES) diff -ur csound5~/Opcodes/stk/stkOpcodes.cpp csound5/Opcodes/stk/stkOpcodes.cpp --- csound5~/Opcodes/stk/stkOpcodes.cpp 2012-02-20 12:48:56.000000000 +0100 +++ csound5/Opcodes/stk/stkOpcodes.cpp 2012-02-20 12:49:52.000000000 +0100 @@ -48,35 +48,35 @@ * See the STK class documentation to determine the controller numbers * used by each instrument. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace stk;