diff options
| author | Clement Farabet <clement.farabet@gmail.com> | 2014-07-24 18:02:51 +0400 |
|---|---|---|
| committer | Clement Farabet <clement.farabet@gmail.com> | 2014-07-24 18:02:51 +0400 |
| commit | d66a11ebbdb85e6348aec148a95fc56a8fdabaeb (patch) | |
| tree | acf0a76f2ac360b6a702ce290f4ea6f05b54fd37 /CMakeLists.txt | |
| parent | 6217ca696a5d5cebc6c705b6575c5dea5c60d0f2 (diff) | |
| parent | 082080dfee2484cc1b7b3269a0a4408e839d12c5 (diff) | |
Merge branch 'fabio' of github.com:jucor/image into jucor-fabio
Conflicts:
CMakeLists.txt
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e81a61..00ab06f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ else (PNG_FOUND) endif (PNG_FOUND) SET(src image.c) -SET(luasrc init.lua lena.jpg lena.png win.ui) +SET(luasrc init.lua fabio.jpg fabio.png lena.jpg lena.png win.ui) ADD_TORCH_PACKAGE(image "${src}" "${luasrc}" "Image Processing") TARGET_LINK_LIBRARIES(image luaT TH) |