hotfix for #927 (#953)

Former-commit-id: f6be875

Author: xunzhang

examples/CMakeLists.txt

@@ -7,7 +7,8 @@ if(ENABLE_BOOST)
 endif()
 
 macro(ADD_EXAMPLE FOLDER TARGET)
-  ADD_EXECUTABLE(${TARGET} ${FOLDER}/train_${TARGET}.cc)
+  include_directories(${PROJECT_SOURCE_DIR}/examples/cpp-utils)
+  add_executable(${TARGET} ${FOLDER}/train_${TARGET}.cc)
   target_link_libraries(${TARGET} dynet ${LIBS})
   if (WITH_CUDA_BACKEND)
     CUDA_ADD_CUBLAS_TO_TARGET(${TARGET})

examples/batching/train_rnnlm-batch.cc

@@ -5,8 +5,7 @@
  */
 #include "rnnlm-batch.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
-#include "../cpp-utils/cl-args.h"
+#include "cl-args.h"
 
 using namespace std;
 using namespace dynet;

examples/document-classification/train_imdb.cc

@@ -25,8 +25,7 @@
 #include "dynet/expr.h"
 #include "dynet/globals.h"
 #include "dynet/io.h"
-
-// #include "../cpp-utils/getpid.h"
+#include "getpid.h"
 
 #include <iostream>
 #include <fstream>

examples/mnist/train_mnist.cc

@@ -5,10 +5,9 @@
  */
 #include "mlp.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
-#include "../cpp-utils/cl-args.h"
-#include "../cpp-utils/data-io.h"
-
+#include "getpid.h"
+#include "cl-args.h"
+#include "data-io.h"
 
 using namespace std;
 using namespace dynet;

examples/poisson-regression/train_poisson-regression.cc

@@ -11,7 +11,7 @@
 #include "dynet/expr.h"
 #include "dynet/globals.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
+#include "getpid.h"
 
 #include <iostream>
 #include <fstream>

examples/rnnlm/train_rnnlm.cc

@@ -11,8 +11,8 @@
 #include "dynet/hsm-builder.h"
 #include "dynet/globals.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
-#include "../cpp-utils/cl-args.h"
+#include "getpid.h"
+#include "cl-args.h"
 
 #include <iostream>
 #include <fstream>

examples/sequence-to-sequence/train_encdec.cc

@@ -6,8 +6,7 @@
  */
 #include "encdec.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
-#include "../cpp-utils/cl-args.h"
+#include "cl-args.h"
 
 using namespace std;
 using namespace dynet;

examples/softmax-builders/train_rnnlm-cfsm.cc

@@ -10,7 +10,7 @@
 #include "dynet/cfsm-builder.h"
 #include "dynet/globals.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
+#include "getpid.h"
 
 #include <iostream>
 #include <fstream>

examples/tagger/train_tag-bilstm.cc

@@ -13,7 +13,7 @@
 #include "dynet/expr.h"
 #include "dynet/globals.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
+#include "getpid.h"
 
 using namespace std;
 using namespace dynet;

examples/textcat/train_textcat.cc

@@ -9,7 +9,6 @@
 #include "dynet/expr.h"
 #include "dynet/globals.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
 
 #include <iostream>
 #include <fstream>

examples/variational-autoencoder/train_rnnlm-aevb.cc

@@ -9,7 +9,7 @@
 #include "dynet/expr.h"
 #include "dynet/globals.h"
 #include "dynet/io.h"
-// #include "../cpp-utils/getpid.h"
+#include "getpid.h"
 
 #include <iostream>
 #include <fstream>

tutorial/CMakeLists.txt

@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 foreach(TARGET 0_multiply 1_linear_regression)
-  ADD_EXECUTABLE(${TARGET} ${TARGET}.cc)
+  add_executable(${TARGET} ${TARGET}.cc)
   target_link_libraries(${TARGET} dynet ${LIBS})
   if(UNIX AND NOT APPLE)
     target_link_libraries(${TARGET} rt)