Erwan changes

src/CMakeLists.txt

@@ -3,17 +3,17 @@ SET(sources imagine-planner.cpp types.cpp queries.cpp effects.cpp domains.cpp pa
 # application header files
 SET(headers imagine-planner.h types.h queries.h effects.h domains.h parsing.h)
 # Ades
-SET(CMAKE_MODULE_PATH /usr/lib/cmake/libades)
-FIND_PACKAGE(libimagine-ades)
+SET(CMAKE_MODULE_PATH /usr/local/lib/cmake/ades)
+FIND_PACKAGE(ADES)
 # Boost
 FIND_PACKAGE(Boost REQUIRED COMPONENTS system serialization filesystem unit_test_framework)
 # locate the necessary dependencies
 # add the necessary include directories
-INCLUDE_DIRECTORIES(. ${Boost_INCLUDE_DIR} ${LIBIMAGINE-ADES_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(. ${Boost_INCLUDE_DIR} ${ADES_INCLUDE_DIRS})
 # create the shared library
 ADD_LIBRARY(imagine-planner SHARED ${sources})
 # link necessary libraries
-TARGET_LINK_LIBRARIES(imagine-planner ${LIBIMAGINE-ADES_LIBRARIES})
+TARGET_LINK_LIBRARIES(imagine-planner ${ADES_LIBRARIES})
 
 INSTALL(TARGETS imagine-planner
         RUNTIME DESTINATION bin

src/domains.cpp

 #include "domains.h"
 #include <sstream>
-#include <libades/libades.h>
+#include <ades/libades.h>
 
 namespace imagine_planner
 {

src/examples/CMakeLists.txt

@@ -4,7 +4,7 @@ ADD_EXECUTABLE(imagine-planner_test imagine-planner_test.cpp)
 TARGET_LINK_LIBRARIES(imagine-planner_test
                       imagine-planner
                       ${Boost_LIBRARIES}
-                      ${LIBIMAGINE-ADES_LIBRARIES})
+                      ${ADES_LIBRARIES})
 
 ADD_EXECUTABLE(types_test types_test.cpp)
 TARGET_LINK_LIBRARIES(types_test
@@ -30,5 +30,5 @@ ADD_EXECUTABLE(domains_test domains_test.cpp)
 TARGET_LINK_LIBRARIES(domains_test
                       imagine-planner
                       ${Boost_LIBRARIES}
-                      ${LIBIMAGINE-ADES_LIBRARIES})
+                      ${ADES_LIBRARIES})
 

src/examples/domains_test.cpp

@@ -3,7 +3,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include "domains.h"
-#include <libades/libades.h>
+#include <ades/libades.h>
 #include <iostream>
 using namespace imagine_planner;
 

src/examples/imagine-planner_test.cpp

 #include "imagine-planner.h"
-#include <libades/libades.h>
+#include <ades/libades.h>
 #include <iostream>
 #include <unordered_set>
 using namespace imagine_planner;