Fix cmake variables

CMakeLists.txt

@@ -5,40 +5,40 @@ ENABLE_TESTING()
 SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-SET(ARTIS_MAJOR 1)
-SET(ARTIS_MINOR 0)
-SET(ARTIS_PATCH 0)
-SET(ARTIS_EXTRA "")
-SET(ARTIS_VERSION "${ARTIS_MAJOR}.${ARTIS_MINOR}.${ARTIS_PATCH}")
-SET(ARTIS_VERSION_SHORT "${ARTIS_MAJOR}.${ARTIS_MINOR}")
-SET(ARTIS_NAME "artis-star")
-SET(ARTIS_NAME_VERSION "${ARTIS_NAME}-${ARTIS_VERSION}")
-SET(ARTIS_LOCALE_NAME "${ARTIS_NAME}-${ARTIS_MAJOR}-${ARTIS_MINOR}")
-IF ("${ARTIS_EXTRA}" STREQUAL "")
-    SET(ARTIS_COMPLETE "${ARTIS_MAJOR}.${ARTIS_MINOR}.${ARTIS_PATCH}")
-ELSE ("${ARTIS_EXTRA}" STREQUAL "")
-    SET(ARTIS_COMPLETE "${ARTIS_MAJOR}.${ARTIS_MINOR}.${ARTIS_PATCH}-${ARTIS_EXTRA}")
-ENDIF ("${ARTIS_EXTRA}" STREQUAL "")
-SET(ARTIS_NAME_COMPLETE "${ARTIS_NAME}-${ARTIS_COMPLETE}")
+SET(ARTIS_STAR_MAJOR 1)
+SET(ARTIS_STAR_MINOR 0)
+SET(ARTIS_STAR_PATCH 0)
+SET(ARTIS_STAR_EXTRA "")
+SET(ARTIS_STAR_VERSION "${ARTIS_STAR_MAJOR}.${ARTIS_STAR_MINOR}.${ARTIS_STAR_PATCH}")
+SET(ARTIS_STAR_VERSION_SHORT "${ARTIS_STAR_MAJOR}.${ARTIS_STAR_MINOR}")
+SET(ARTIS_STAR_NAME "artis-star")
+SET(ARTIS_STAR_NAME_VERSION "${ARTIS_STAR_NAME}-${ARTIS_STAR_VERSION}")
+SET(ARTIS_STAR_LOCALE_NAME "${ARTIS_STAR_NAME}-${ARTIS_STAR_MAJOR}-${ARTIS_STAR_MINOR}")
+IF ("${ARTIS_STAR_EXTRA}" STREQUAL "")
+    SET(ARTIS_STAR_COMPLETE "${ARTIS_STAR_MAJOR}.${ARTIS_STAR_MINOR}.${ARTIS_STAR_PATCH}")
+ELSE ("${ARTIS_STAR_EXTRA}" STREQUAL "")
+    SET(ARTIS_STAR_COMPLETE "${ARTIS_STAR_MAJOR}.${ARTIS_STAR_MINOR}.${ARTIS_STAR_PATCH}-${ARTIS_STAR_EXTRA}")
+ENDIF ("${ARTIS_STAR_EXTRA}" STREQUAL "")
+SET(ARTIS_STAR_NAME_COMPLETE "${ARTIS_STAR_NAME}-${ARTIS_STAR_COMPLETE}")
 
 #
 # Installation variables
 #
 
-SET(ARTIS_LIBRARY_DIRS "lib/artis-star-${ARTIS_VERSION_SHORT}")
-SET(ARTIS_INCLUDE_DIRS "include/artis-star-${ARTIS_VERSION_SHORT}/artis-star")
-SET(ARTIS_INCLUDE_DIR "include/artis-star-${ARTIS_VERSION_SHORT}")
-SET(ARTIS_MANPAGE_PATH "share/man/man1")
-SET(ARTIS_SHARE_DIRS "share/artis-star-${ARTIS_VERSION_SHORT}")
+SET(ARTIS_STAR_LIBRARY_DIRS "lib/artis-star-${ARTIS_STAR_VERSION_SHORT}")
+SET(ARTIS_STAR_INCLUDE_DIRS "include/artis-star-${ARTIS_STAR_VERSION_SHORT}/artis-star")
+SET(ARTIS_STAR_INCLUDE_DIR "include/artis-star-${ARTIS_STAR_VERSION_SHORT}")
+SET(ARTIS_STAR_MANPAGE_PATH "share/man/man1")
+SET(ARTIS_STAR_SHARE_DIRS "share/artis-star-${ARTIS_STAR_VERSION_SHORT}")
 
 #
 # Append the library version information to the library target
 # properties.
 #
 
-SET(ARTIS_LIBRARY_PROPERTIES VERSION 0)
-SET(ARTIS_APP_PROPERTIES SOVERSION "${ARTIS_MAJOR}.${ARTIS_MINOR}"
-        VERSION "${ARTIS_MAJOR}.${ARTIS_MINOR}")
+SET(ARTIS_STAR_LIBRARY_PROPERTIES VERSION 0)
+SET(ARTIS_STAR_APP_PROPERTIES SOVERSION "${ARTIS_STAR_MAJOR}.${ARTIS_STAR_MINOR}"
+        VERSION "${ARTIS_STAR_MAJOR}.${ARTIS_STAR_MINOR}")
 
 #
 # Debug mode
@@ -80,22 +80,22 @@ find_package(Boost 1.71 COMPONENTS mpi serialization unit_test_framework)
 # Generate the config.h
 #
 
-CHECK_INCLUDE_FILE_CXX(cxxabi.h ARTIS_HAVE_GCC_ABI_DEMANGLE)
-CHECK_INCLUDE_FILE_CXX(execinfo.h ARTIS_HAVE_EXECINFO)
-CHECK_INCLUDE_FILE_CXX(signal.h ARTIS_HAVE_SIGNAL)
+CHECK_INCLUDE_FILE_CXX(cxxabi.h ARTIS_STAR_HAVE_GCC_ABI_DEMANGLE)
+CHECK_INCLUDE_FILE_CXX(execinfo.h ARTIS_STAR_HAVE_EXECINFO)
+CHECK_INCLUDE_FILE_CXX(signal.h ARTIS_STAR_HAVE_SIGNAL)
 INCLUDE_DIRECTORIES(${ARTIS_STAR_BINARY_DIR})
 
 #
 # Generate the artis.pc pkg-config file.
 #
 
-SET(ARTIS_PKGCONFIG_PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
-SET(ARTIS_PKGCONFIG_BOOSTINCLUDE_DIRS "${Boost_INCLUDE_DIRS}")
-SET(ARTIS_PKGCONFIG_LIBDIR "lib")
+SET(ARTIS_STAR_PKGCONFIG_PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
+SET(ARTIS_STAR_PKGCONFIG_BOOSTINCLUDE_DIRS "${Boost_INCLUDE_DIRS}")
+SET(ARTIS_STAR_PKGCONFIG_LIBDIR "lib")
 
 CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/src/artis-star.pc.in
-        ${ARTIS_STAR_BINARY_DIR}/artis-star-${ARTIS_VERSION_SHORT}.pc @ONLY)
-INSTALL(FILES ${ARTIS_STAR_BINARY_DIR}/artis-star-${ARTIS_VERSION_SHORT}.pc
+        ${ARTIS_STAR_BINARY_DIR}/artis-star-${ARTIS_STAR_VERSION_SHORT}.pc @ONLY)
+INSTALL(FILES ${ARTIS_STAR_BINARY_DIR}/artis-star-${ARTIS_STAR_VERSION_SHORT}.pc
         DESTINATION lib/pkgconfig)
 
 #
@@ -103,11 +103,11 @@ INSTALL(FILES ${ARTIS_STAR_BINARY_DIR}/artis-star-${ARTIS_VERSION_SHORT}.pc
 #
 
 IF (UNIX)
-    INSTALL(FILES "README" DESTINATION "${ARTIS_SHARE_DIRS}")
-    INSTALL(FILES "COPYING" DESTINATION "${ARTIS_SHARE_DIRS}")
+    INSTALL(FILES "README" DESTINATION "${ARTIS_STAR_SHARE_DIRS}")
+    INSTALL(FILES "COPYING" DESTINATION "${ARTIS_STAR_SHARE_DIRS}")
 ELSE (UNIX)
-    INSTALL(FILES "README" DESTINATION "${ARTIS_SHARE_DIRS}" RENAME "Readme.txt")
-    INSTALL(FILES "COPYING" DESTINATION "${ARTIS_SHARE_DIRS}" RENAME "CopyRight.txt")
+    INSTALL(FILES "README" DESTINATION "${ARTIS_STAR_SHARE_DIRS}" RENAME "Readme.txt")
+    INSTALL(FILES "COPYING" DESTINATION "${ARTIS_STAR_SHARE_DIRS}" RENAME "CopyRight.txt")
 ENDIF (UNIX)
 
 #
@@ -144,15 +144,15 @@ ADD_SUBDIRECTORY(tests)
 #
 
 MESSAGE(STATUS "- - - -")
-MESSAGE(STATUS "${ARTIS_NAME_COMPLETE} configured successfully")
+MESSAGE(STATUS "${ARTIS_STAR_NAME_COMPLETE} configured successfully")
 MESSAGE(STATUS "Using ${CMAKE_INSTALL_PREFIX} for installation")
 MESSAGE(STATUS "Build type ${CMAKE_BUILD_TYPE}")
-IF (ARTIS_HAVE_GCC_ABI_DEMANGLE)
+IF (ARTIS_STAR_HAVE_GCC_ABI_DEMANGLE)
     MESSAGE(STATUS "Build with GCC ABI Demangle...: yes")
-ENDIF (ARTIS_HAVE_GCC_ABI_DEMANGLE)
-IF (ARTIS_HAVE_EXECINFO)
+ENDIF (ARTIS_STAR_HAVE_GCC_ABI_DEMANGLE)
+IF (ARTIS_STAR_HAVE_EXECINFO)
     MESSAGE(STATUS "Build with execinfo.h.........: yes")
-ENDIF (ARTIS_HAVE_EXECINFO)
+ENDIF (ARTIS_STAR_HAVE_EXECINFO)
 IF (Boost_FOUND)
     MESSAGE(STATUS "Build with boost..............: yes")
 ENDIF (Boost_FOUND)

src/CMakeLists.txt

@@ -12,7 +12,7 @@ TARGET_LINK_LIBRARIES(artislib ${Boost_LIBRARIES})
 
 SET_TARGET_PROPERTIES(artislib PROPERTIES
         VERSION 0
-        OUTPUT_NAME "artis-star-${ARTIS_VERSION_SHORT}"
+        OUTPUT_NAME "artis-star-${ARTIS_STAR_VERSION_SHORT}"
         LINKER_LANGUAGE CXX
         CLEAN_DIRECT_OUTPUT 1)
 

src/artis-star.pc.in

@@ -1,11 +1,11 @@
-prefix=@ARTIS_PKGCONFIG_PREFIXPATH@
+prefix=@ARTIS_STAR_PKGCONFIG_PREFIXPATH@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/@ARTIS_PKGCONFIG_LIBDIR@
+libdir=${exec_prefix}/@ARTIS_STAR_PKGCONFIG_LIBDIR@
 includedir=${prefix}/include
 
 Name: artis-star
 Description: ARTIS* Multimodeling and Simulation tools
 Requires:
-Version: @ARTIS_VERSION@
-Libs:	-L${libdir} -lartis-star-@ARTIS_VERSION_SHORT@
-Cflags: -I${includedir}/artis-star-@ARTIS_VERSION_SHORT@ -I@ARTIS_PKGCONFIG_BOOSTINCLUDE_DIRS@
+Version: @ARTIS_STAR_VERSION@
+Libs:	-L${libdir} -lartis-star-@ARTIS_STAR_VERSION_SHORT@
+Cflags: -I${includedir}/artis-star-@ARTIS_STAR_VERSION_SHORT@ -I@ARTIS_STAR_PKGCONFIG_BOOSTINCLUDE_DIRS@

src/artis-star/common/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -11,7 +11,7 @@ SET(COMMON_HPP Coordinator.hpp GraphManager.hpp Links.hpp Model.hpp Node.hpp Par
 
 ADD_SOURCES(artislib ${COMMON_HPP})
 
-INSTALL(FILES ${COMMON_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/common)
+INSTALL(FILES ${COMMON_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/common)
 
 ADD_SUBDIRECTORY(context)
 ADD_SUBDIRECTORY(event)

src/artis-star/common/context/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -11,4 +11,4 @@ SET(COMMON_CONTEXT_HPP Context.hpp State.hpp StateValues.hpp)
 ADD_SOURCES(artislib ${COMMON_CONTEXT_HPP})
 
 INSTALL(FILES ${COMMON_CONTEXT_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/common/context)
+        ${ARTIS_STAR_INCLUDE_DIRS}/common/context)

src/artis-star/common/event/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -12,4 +12,4 @@ SET(COMMON_EVENT_CPP Value.cpp)
 ADD_SOURCES(artislib ${COMMON_EVENT_HPP} ${COMMON_EVENT_CPP})
 
 INSTALL(FILES ${COMMON_EVENT_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/common/event)
+        ${ARTIS_STAR_INCLUDE_DIRS}/common/event)

src/artis-star/common/observer/CMakeLists.txt

@@ -9,4 +9,4 @@ SET(COMMON_OBSERVER_HPP DiscreteTimeIterator.hpp EventIterator.hpp Iterator.hpp
 ADD_SOURCES(artislib ${COMMON_OBSERVER_HPP})
 
 INSTALL(FILES ${COMMON_OBSERVER_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/common/observer)
+        ${ARTIS_STAR_INCLUDE_DIRS}/common/observer)

src/artis-star/common/scheduler/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -11,4 +11,4 @@ SET(COMMON_SCHEDULER_HPP HeapScheduler.hpp SchedulerHandle.hpp VectorScheduler.h
 ADD_SOURCES(artislib ${COMMON_SCHEDULER_HPP})
 
 INSTALL(FILES ${COMMON_SCHEDULER_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/common/scheduler)
+        ${ARTIS_STAR_INCLUDE_DIRS}/common/scheduler)

src/artis-star/common/state/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -11,4 +11,4 @@ SET(COMMON_STATE_HPP Any.hpp States.hpp)
 ADD_SOURCES(artislib ${COMMON_STATE_HPP})
 
 INSTALL(FILES ${COMMON_STATE_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/common/state)
+        ${ARTIS_STAR_INCLUDE_DIRS}/common/state)

src/artis-star/common/time/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,4 +10,4 @@ SET(COMMON_TIME_HPP DoubleTime.hpp IntegerTime.hpp Limits.hpp RationalTime.hpp T
 
 ADD_SOURCES(artislib ${COMMON_TIME_HPP})
 
-INSTALL(FILES ${COMMON_TIME_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/common/time)
+INSTALL(FILES ${COMMON_TIME_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/common/time)

src/artis-star/common/utils/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -11,4 +11,4 @@ SET(COMMON_UTILS_HPP FormalismType.hpp FunctionType.hpp LevelType.hpp Macro.hpp
 ADD_SOURCES(artislib ${COMMON_UTILS_HPP})
 
 INSTALL(FILES ${COMMON_UTILS_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/common/utils)
+        ${ARTIS_STAR_INCLUDE_DIRS}/common/utils)

src/artis-star/kernel/devs/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,4 +10,4 @@ SET(DEVS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Simulator.hpp)
 
 ADD_SOURCES(artislib ${DEVS_HPP})
 
-INSTALL(FILES ${DEVS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/devs)
+INSTALL(FILES ${DEVS_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/kernel/devs)

src/artis-star/kernel/dsde/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,4 +10,4 @@ SET(DSDE_HPP Coordinator.hpp Executive.hpp GraphManager.hpp)
 
 ADD_SOURCES(artislib ${DSDE_HPP})
 
-INSTALL(FILES ${DSDE_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/dsde)
+INSTALL(FILES ${DSDE_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/kernel/dsde)

src/artis-star/kernel/dtss/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,4 +10,4 @@ SET(DTSS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Policy.hpp Simulator.
 
 ADD_SOURCES(artislib ${DTSS_HPP})
 
-INSTALL(FILES ${DTSS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/dtss)
+INSTALL(FILES ${DTSS_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/kernel/dtss)

src/artis-star/kernel/fddevs/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,4 +10,4 @@ SET(FDDEVS_HPP Coordinator.hpp Dynamics.hpp GraphManager.hpp Simulator.hpp)
 
 ADD_SOURCES(artislib ${FDDEVS_HPP})
 
-INSTALL(FILES ${FDDEVS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/fddevs)
+INSTALL(FILES ${FDDEVS_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/kernel/fddevs)

src/artis-star/kernel/pdevs/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,7 +10,7 @@ SET(PDEVS_HPP Context.hpp Coordinator.hpp Dynamics.hpp GraphManager.hpp Simulato
 
 ADD_SOURCES(artislib ${PDEVS_HPP})
 
-INSTALL(FILES ${PDEVS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/pdevs)
+INSTALL(FILES ${PDEVS_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/kernel/pdevs)
 
 ADD_SUBDIRECTORY(multithreading)
 ADD_SUBDIRECTORY(mpi)

src/artis-star/kernel/pdevs/mpi/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -12,4 +12,4 @@ SET(PDEVS_MPI_HPP Coordinator.hpp GraphManager.hpp LogicalProcessor.hpp
 ADD_SOURCES(artislib ${PDEVS_MPI_HPP})
 
 INSTALL(FILES ${PDEVS_MPI_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/kernel/pdevs/mpi)
+        ${ARTIS_STAR_INCLUDE_DIRS}/kernel/pdevs/mpi)

src/artis-star/kernel/pdevs/multithreading/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -11,4 +11,4 @@ SET(PDEVS_MULTITHREADING_HPP Coordinator.hpp)
 ADD_SOURCES(artislib ${PDEVS_MULTITHREADING_HPP})
 
 INSTALL(FILES ${PDEVS_MULTITHREADING_HPP} DESTINATION
-        ${ARTIS_INCLUDE_DIRS}/kernel/pdevs/multithreading)
+        ${ARTIS_STAR_INCLUDE_DIRS}/kernel/pdevs/multithreading)

src/artis-star/kernel/qss/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,4 +10,4 @@ SET(QSS_HPP Data.hpp Derivative.hpp Integrator.hpp MultiDerivative.hpp Quantifie
 
 ADD_SOURCES(artislib ${QSS_HPP})
 
-INSTALL(FILES ${QSS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/qss)
+INSTALL(FILES ${QSS_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/kernel/qss)

src/artis-star/kernel/sss/CMakeLists.txt

@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(
-        ${ARTIS_BINARY_DIR}/src
-        ${ARTIS_SOURCE_DIR}/src
+        ${ARTIS_STAR_BINARY_DIR}/src
+        ${ARTIS_STAR_SOURCE_DIR}/src
         ${Boost_INCLUDE_DIRS})
 
 LINK_DIRECTORIES(
@@ -10,4 +10,4 @@ SET(SSS_HPP Context.hpp Coordinator.hpp Dynamics.hpp GraphManager.hpp Model.hpp
 
 ADD_SOURCES(artislib ${SSS_HPP})
 
-INSTALL(FILES ${SSS_HPP} DESTINATION ${ARTIS_INCLUDE_DIRS}/kernel/sss)
+INSTALL(FILES ${SSS_HPP} DESTINATION ${ARTIS_STAR_INCLUDE_DIRS}/kernel/sss)