use new artis* library

CMakeLists.txt

@@ -80,7 +80,7 @@ INCLUDE(CMakeDetermineCCompiler)
 
 FIND_PACKAGE(PkgConfig REQUIRED)
 
-PKG_CHECK_MODULES(ARTIS REQUIRED artis-star-1.0)
+PKG_CHECK_MODULES(ARTIS_STAR REQUIRED artis-star-1.0)
 PKG_CHECK_MODULES(ARTIS_ADDONS REQUIRED artis-addons-1.0)
 
 #

src/tests/common/CMakeLists.txt

@@ -2,11 +2,11 @@ add_definitions(-DWITH_TRACE)
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
+        ${ARTIS_STAR_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES()
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(common-tests multithreading-tests.cpp time-tests.cpp)
 
-TARGET_LINK_LIBRARIES(common-tests)
+TARGET_LINK_LIBRARIES(common-tests ${ARTIS_STAR_LIBRARIES})

src/tests/devs/CMakeLists.txt

@@ -2,11 +2,11 @@ add_definitions(-DWITH_TRACE)
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
+        ${ARTIS_STAR_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES()
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(devs-tests graph_manager.hpp models.hpp tests.cpp)
 
-TARGET_LINK_LIBRARIES(devs-tests)
+TARGET_LINK_LIBRARIES(devs-tests ${ARTIS_STAR_LIBRARIES})

src/tests/dsde/CMakeLists.txt

@@ -2,11 +2,11 @@ add_definitions(-DWITH_TRACE)
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
+        ${ARTIS_STAR_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES()
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(dsde-tests graph_manager.hpp models.hpp tests.cpp)
 
-TARGET_LINK_LIBRARIES(dsde-tests)
+TARGET_LINK_LIBRARIES(dsde-tests ${ARTIS_STAR_LIBRARIES})

src/tests/dtss/CMakeLists.txt

@@ -2,18 +2,11 @@ add_definitions(-DWITH_TRACE)
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-        ${GLIBMM_INCLUDE_DIRS}
-        ${LIBXML_INCLUDE_DIRS})
+        ${ARTIS_STAR_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES(
-        ${GLIBMM_LIBRARY_DIRS}
-        ${LIBXML_LIBRARY_DIR})
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(dtss-tests graph_manager.hpp models.hpp tests.cpp)
 
-TARGET_LINK_LIBRARIES(dtss-tests
-        ${GLIBMM_LIBRARIES}
-        ${LIBXML_LIBRARIES}
-        ${GTHREAD_LIBRARIES})
+TARGET_LINK_LIBRARIES(dtss-tests ${ARTIS_STAR_LIBRARIES})

src/tests/fddevs/CMakeLists.txt

@@ -2,13 +2,11 @@ add_definitions(-DWITH_TRACE)
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
+        ${ARTIS_STAR_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES()
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(fddevs-tests graph_manager.hpp models.hpp tests.cpp)
 
-TARGET_LINK_LIBRARIES(fddevs-tests
-        ${Boost_SYSTEM_LIBRARY}
-        ${Boost_TIMER_LIBRARY})
+TARGET_LINK_LIBRARIES(fddevs-tests  ${ARTIS_STAR_LIBRARIES})

src/tests/mixed/CMakeLists.txt

@@ -2,20 +2,13 @@ add_definitions(-DWITH_TRACE)
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-        ${GLIBMM_INCLUDE_DIRS}
-        ${LIBXML_INCLUDE_DIRS})
+        ${ARTIS_STAR_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES(
-        ${GLIBMM_LIBRARY_DIRS}
-        ${LIBXML_LIBRARY_DIR})
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 SET(MIXED_TESTS_HPP graph_manager.hpp models.hpp)
 
 ADD_EXECUTABLE(mixed-tests ${MIXED_TESTS_HPP} tests.cpp)
 
-TARGET_LINK_LIBRARIES(mixed-tests
-        ${GLIBMM_LIBRARIES}
-        ${LIBXML_LIBRARIES}
-        ${GTHREAD_LIBRARIES})
+TARGET_LINK_LIBRARIES(mixed-tests  ${ARTIS_STAR_LIBRARIES})

src/tests/mpi/CMakeLists.txt

@@ -1,18 +1,13 @@
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-        ${GLIBMM_INCLUDE_DIRS}
-        ${LIBXML_INCLUDE_DIRS})
+        ${ARTIS_STAR_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES(
-        ${Boost_LIBRARY_DIRS}
-        ${GLIBMM_LIBRARY_DIRS}
-        ${LIBXML_LIBRARY_DIR})
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(pdevs-mpi-main graph_manager.hpp main.cpp)
 
-TARGET_LINK_LIBRARIES(pdevs-mpi-main
+TARGET_LINK_LIBRARIES(pdevs-mpi-main ${ARTIS_STAR_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
         ${Boost_SERIALIZATION_LIBRARY}
         ${Boost_MPI_LIBRARY}

src/tests/multithreading/lifegame/CMakeLists.txt

@@ -1,17 +1,13 @@
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-        ${GLIBMM_INCLUDE_DIRS}
-        ${LIBXML_INCLUDE_DIRS})
+        ${ARTIS_STAR_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES(
-        ${GLIBMM_LIBRARY_DIRS}
-        ${LIBXML_LIBRARY_DIR})
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(pdevs-multithreading-lifegame-main graph_manager.hpp main.cpp models.hpp)
 
-TARGET_LINK_LIBRARIES(pdevs-multithreading-lifegame-main
+TARGET_LINK_LIBRARIES(pdevs-multithreading-lifegame-main  ${ARTIS_STAR_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
         ${Boost_SYSTEM_LIBRARY}
         ${Boost_TIMER_LIBRARY})

src/tests/multithreading/simple/CMakeLists.txt

@@ -1,17 +1,13 @@
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
-        ${Boost_INCLUDE_DIRS}
-        ${GLIBMM_INCLUDE_DIRS}
-        ${LIBXML_INCLUDE_DIRS})
+        ${ARTIS_STAR_INCLUDE_DIRS}
+        ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES(
-        ${GLIBMM_LIBRARY_DIRS}
-        ${LIBXML_LIBRARY_DIR})
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(pdevs-multithreading-simple-main graph_manager.hpp main.cpp models.hpp)
 
-TARGET_LINK_LIBRARIES(pdevs-multithreading-simple-main
+TARGET_LINK_LIBRARIES(pdevs-multithreading-simple-main  ${ARTIS_STAR_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
         ${Boost_SYSTEM_LIBRARY}
         ${Boost_TIMER_LIBRARY})

src/tests/pdevs/CMakeLists.txt

@@ -2,17 +2,15 @@ add_definitions(-DWITH_TRACE)
 
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
+        ${ARTIS_STAR_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES()
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(pdevs-tests graph_manager.hpp models.hpp tests.cpp)
 
-TARGET_LINK_LIBRARIES(pdevs-tests
-        ${Boost_SYSTEM_LIBRARY}
-        ${Boost_TIMER_LIBRARY})
+TARGET_LINK_LIBRARIES(pdevs-tests ${Boost_SYSTEM_LIBRARY} ${Boost_TIMER_LIBRARY} ${ARTIS_STAR_LIBRARIES})
 
 ADD_EXECUTABLE(pdevs-main graph_manager.hpp models.hpp main.cpp)
 
-TARGET_LINK_LIBRARIES(pdevs-main ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(pdevs-main ${Boost_LIBRARIES} ${ARTIS_STAR_LIBRARIES})

src/tests/qss/CMakeLists.txt

@@ -1,11 +1,11 @@
 INCLUDE_DIRECTORIES(
         ${CMAKE_SOURCE_DIR}/src
-        ${ARTIS_INCLUDE_DIRS}
+        ${ARTIS_STAR_INCLUDE_DIRS}
         ${ARTIS_ADDONS_INCLUDE_DIRS}
         ${Boost_INCLUDE_DIRS})
 
-LINK_DIRECTORIES()
+LINK_DIRECTORIES(${ARTIS_STAR_LIBRARY_DIRS})
 
 ADD_EXECUTABLE(qss-main graph_manager.hpp models.hpp main.cpp)
 
-TARGET_LINK_LIBRARIES(qss-main ${Boost_LIBRARIES})
+TARGET_LINK_LIBRARIES(qss-main ${Boost_LIBRARIES}  ${ARTIS_STAR_LIBRARIES})