update boost repo, update poppler build

.travis.yml

@@ -22,7 +22,7 @@ addons:
   apt:
     packages:
     - cmake
-    - libboost1.55-all-dev
+    - libboost-all-dev
     - libcppunit-dev
     - dvipng
     - texlive
@@ -34,9 +34,9 @@ addons:
     - librsvg2-dev
     - glade-gtk2
     - libglade2-dev
-#    - libpoppler-dev
-#    - libpoppler-cpp-dev
-#    - libpoppler-glib-dev
+    - libpoppler-dev
+    - libpoppler-cpp-dev
+    - libpoppler-glib-dev
     sources:
     - boost-latest
     - kalakris-cmake
@@ -45,7 +45,7 @@ addons:
       name: "peetCreative/xournalpp"
       description: "Notetaking software designed around a tablet."
     notification_email: peter_klausing@wh2.tu-dresden.de
-    build_command_prepend: "cmake .. -DBUILD_POPPLER=ON -DEXT_GLIBMM=ON -DENABLE_MATHTEX=ON -DENABLE_CPPUNIT=ON -DUNSTABLE_LAYERS_SIDEBAR=ON"
+    build_command_prepend: "cmake .. -DBUILD_POPPLER=ON -DENABLE_MATHTEX=ON -DENABLE_CPPUNIT=ON -DUNSTABLE_LAYERS_SIDEBAR=ON"
     build_command: "make"
     branch_pattern: coverity_scan
 
@@ -54,7 +54,7 @@ before_script:
   - "cd build"
 
 script:
-  - "cmake .. -DBUILD_POPPLER=ON -DEXT_GLIBMM=ON -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_MATHTEX=ON -DENABLE_CPPUNIT=ON -DUNSTABLE_LAYERS_SIDEBAR=ON -DDEBUG_COMPILE=ON"
+  - "cmake .. -DCMAKE_DEBUG_INCLUDES_LDFLAGS=ON -DENABLE_MATHTEX=ON -DENABLE_CPPUNIT=ON -DUNSTABLE_LAYERS_SIDEBAR=ON -DDEBUG_COMPILE=ON"
   - "make"
   - "ctest"
 

CMakeLists.txt

@@ -40,8 +40,7 @@ if (BUILD_BOOST)
 
   include (ExternalProject)
   ExternalProject_Add (boost
-    SVN_REPOSITORY http://svn.boost.org/svn/boost/branches/release
-    LOG_DOWNLOAD 1
+    GIT_REPOSITORY https://github.com/boostorg/boost.git
     PREFIX "${BOOST_PREFIX}"
 
     CONFIGURE_COMMAND cd "${BOOST_PREFIX}/src/boost" && ./bootstrap.sh --prefix="${BOOST_PREFIX}"
@@ -135,16 +134,15 @@ if (BUILD_POPPLER)
   set (lcms_INCLUDE_DIRS "${lcms${lcms_VERSION}_INCLUDE_DIRS}")
   
   link_directories (
-    "${POPPLER_PREFIX}/src/poppler/poppler/.libs"
-    "${POPPLER_PREFIX}/src/poppler/glib/.libs"
-    "${POPPLER_PREFIX}/src/poppler/cpp/.libs"
-    "${POPPLER_PREFIX}/src/poppler/utils/.libs"
+    "${POPPLER_PREFIX}/src/poppler"
+    "${POPPLER_PREFIX}/src/poppler/glib"
+    "${POPPLER_PREFIX}/src/poppler/cpp"
+    "${POPPLER_PREFIX}/src/poppler/utils"
   )
   set (POPPLER_LIBRARIES
-    libpoppler.a
-    libpoppler-cairo.a
-    libpoppler-cpp.a
-    libpoppler-glib.a
+    libpoppler.so
+    libpoppler-cpp.so
+    libpoppler-glib.so
     
     ${OPENJPEG_LIBRARIES}
     -lopenjpeg