diff --git a/.gitignore b/.gitignore
index 6f15a4cb4..750826475 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
-#Third-Party libs
-resources/3rdparty/log4cplus-1.1.0/
-resources/3rdparty/gtest-1.6.0/
-resources/3rdparty/eigen/
-resources/3rdparty/gmm-4.2/
+##Third-Party libs
+resources/3rdparty/log4cplus-1.1.0/**
+resources/3rdparty/gtest-1.6.0/**
+resources/3rdparty/eigen/**
+resources/3rdparty/gmm-4.2/**
#Visual Studio files
*.[Oo]bj
*.user
@@ -25,6 +25,8 @@ resources/3rdparty/gmm-4.2/
*.sdf
*.opensdf
*.unsuccessfulbuild
+# XCode directories and files
+storm/**
ipch/
obj/
CMakeFiles/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3818fee66..2e1c2d59c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,7 @@ elseif(MSVC)
add_definitions(/D_SCL_SECURE_NO_DEPRECATE)
else(CLANG)
# Set standard flags for clang
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -funroll-loops")
+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -funroll-loops -O4")
set (CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ -Wall -Werror -pedantic -Wno-unused-variable")
set (CMAKE_CXX_FLAGS_DEBUG "-g")
diff --git a/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake b/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake
index 0aa7c922c..b6ce7d395 100644
--- a/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake
@@ -10,24 +10,24 @@
# usually begin with CPACK_<GENNAME>_xxxx.
-SET(CPACK_BINARY_BUNDLE "OFF")
+SET(CPACK_BINARY_BUNDLE "")
SET(CPACK_BINARY_CYGWIN "")
SET(CPACK_BINARY_DEB "OFF")
-SET(CPACK_BINARY_DRAGNDROP "OFF")
+SET(CPACK_BINARY_DRAGNDROP "")
SET(CPACK_BINARY_NSIS "OFF")
-SET(CPACK_BINARY_OSXX11 "OFF")
-SET(CPACK_BINARY_PACKAGEMAKER "ON")
+SET(CPACK_BINARY_OSXX11 "")
+SET(CPACK_BINARY_PACKAGEMAKER "")
SET(CPACK_BINARY_RPM "OFF")
SET(CPACK_BINARY_STGZ "ON")
SET(CPACK_BINARY_TBZ2 "OFF")
SET(CPACK_BINARY_TGZ "ON")
-SET(CPACK_BINARY_TZ "")
+SET(CPACK_BINARY_TZ "ON")
SET(CPACK_BINARY_ZIP "")
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
-SET(CPACK_GENERATOR "PackageMaker;STGZ;TGZ")
-SET(CPACK_INSTALL_CMAKE_PROJECTS "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0;log4cplus;ALL;/")
+SET(CPACK_GENERATOR "STGZ;TGZ;TZ")
+SET(CPACK_INSTALL_CMAKE_PROJECTS "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0;log4cplus;ALL;/")
SET(CPACK_INSTALL_PREFIX "/usr/local")
SET(CPACK_MODULE_PATH "")
SET(CPACK_NSIS_DISPLAY_NAME "log4cplus 1.1.0")
@@ -35,11 +35,11 @@ SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
SET(CPACK_NSIS_PACKAGE_NAME "log4cplus 1.1.0")
-SET(CPACK_OUTPUT_CONFIG_FILE "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake")
+SET(CPACK_OUTPUT_CONFIG_FILE "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake")
SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "/opt/local/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "log4cplus is a log4j-inspired logging library for C++")
-SET(CPACK_PACKAGE_FILE_NAME "log4cplus-1.1.0-Darwin")
+SET(CPACK_PACKAGE_FILE_NAME "log4cplus-1.1.0-Linux")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "log4cplus 1.1.0")
SET(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "log4cplus 1.1.0")
SET(CPACK_PACKAGE_NAME "log4cplus")
@@ -49,16 +49,16 @@ SET(CPACK_PACKAGE_VERSION "1.1.0")
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
-SET(CPACK_RESOURCE_FILE_LICENSE "/opt/local/share/cmake-2.8/Templates/CPack.GenericLicense.txt")
-SET(CPACK_RESOURCE_FILE_README "/opt/local/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
-SET(CPACK_RESOURCE_FILE_WELCOME "/opt/local/share/cmake-2.8/Templates/CPack.GenericWelcome.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "/usr/share/cmake-2.8/Templates/CPack.GenericLicense.txt")
+SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
+SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake-2.8/Templates/CPack.GenericWelcome.txt")
SET(CPACK_SET_DESTDIR "OFF")
SET(CPACK_SOURCE_CYGWIN "")
SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;TZ")
-SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake")
+SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake")
SET(CPACK_SOURCE_TBZ2 "ON")
SET(CPACK_SOURCE_TGZ "ON")
SET(CPACK_SOURCE_TZ "ON")
SET(CPACK_SOURCE_ZIP "OFF")
-SET(CPACK_SYSTEM_NAME "Darwin")
-SET(CPACK_TOPLEVEL_TAG "Darwin")
+SET(CPACK_SYSTEM_NAME "Linux")
+SET(CPACK_TOPLEVEL_TAG "Linux")
diff --git a/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake b/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
index 7604957ab..fecf5aea6 100644
--- a/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
@@ -10,25 +10,25 @@
# usually begin with CPACK_<GENNAME>_xxxx.
-SET(CPACK_BINARY_BUNDLE "OFF")
+SET(CPACK_BINARY_BUNDLE "")
SET(CPACK_BINARY_CYGWIN "")
SET(CPACK_BINARY_DEB "OFF")
-SET(CPACK_BINARY_DRAGNDROP "OFF")
+SET(CPACK_BINARY_DRAGNDROP "")
SET(CPACK_BINARY_NSIS "OFF")
-SET(CPACK_BINARY_OSXX11 "OFF")
-SET(CPACK_BINARY_PACKAGEMAKER "ON")
+SET(CPACK_BINARY_OSXX11 "")
+SET(CPACK_BINARY_PACKAGEMAKER "")
SET(CPACK_BINARY_RPM "OFF")
SET(CPACK_BINARY_STGZ "ON")
SET(CPACK_BINARY_TBZ2 "OFF")
SET(CPACK_BINARY_TGZ "ON")
-SET(CPACK_BINARY_TZ "")
+SET(CPACK_BINARY_TZ "ON")
SET(CPACK_BINARY_ZIP "")
SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
SET(CPACK_COMPONENT_UNSPECIFIED_HIDDEN "TRUE")
SET(CPACK_COMPONENT_UNSPECIFIED_REQUIRED "TRUE")
SET(CPACK_GENERATOR "TGZ;TBZ2;TZ")
SET(CPACK_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp$;\\.#;/#")
-SET(CPACK_INSTALLED_DIRECTORIES "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0;/")
+SET(CPACK_INSTALLED_DIRECTORIES "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0;/")
SET(CPACK_INSTALL_CMAKE_PROJECTS "")
SET(CPACK_INSTALL_PREFIX "/usr/local")
SET(CPACK_MODULE_PATH "")
@@ -37,9 +37,9 @@ SET(CPACK_NSIS_INSTALLER_ICON_CODE "")
SET(CPACK_NSIS_INSTALLER_MUI_ICON_CODE "")
SET(CPACK_NSIS_INSTALL_ROOT "$PROGRAMFILES")
SET(CPACK_NSIS_PACKAGE_NAME "log4cplus 1.1.0")
-SET(CPACK_OUTPUT_CONFIG_FILE "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake")
+SET(CPACK_OUTPUT_CONFIG_FILE "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackConfig.cmake")
SET(CPACK_PACKAGE_DEFAULT_LOCATION "/")
-SET(CPACK_PACKAGE_DESCRIPTION_FILE "/opt/local/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "/usr/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "log4cplus is a log4j-inspired logging library for C++")
SET(CPACK_PACKAGE_FILE_NAME "log4cplus-1.1.0-Source")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "log4cplus 1.1.0")
@@ -51,21 +51,21 @@ SET(CPACK_PACKAGE_VERSION "1.1.0")
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "1")
SET(CPACK_PACKAGE_VERSION_PATCH "1")
-SET(CPACK_RESOURCE_FILE_LICENSE "/opt/local/share/cmake-2.8/Templates/CPack.GenericLicense.txt")
-SET(CPACK_RESOURCE_FILE_README "/opt/local/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
-SET(CPACK_RESOURCE_FILE_WELCOME "/opt/local/share/cmake-2.8/Templates/CPack.GenericWelcome.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "/usr/share/cmake-2.8/Templates/CPack.GenericLicense.txt")
+SET(CPACK_RESOURCE_FILE_README "/usr/share/cmake-2.8/Templates/CPack.GenericDescription.txt")
+SET(CPACK_RESOURCE_FILE_WELCOME "/usr/share/cmake-2.8/Templates/CPack.GenericWelcome.txt")
SET(CPACK_SET_DESTDIR "OFF")
SET(CPACK_SOURCE_CYGWIN "")
SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2;TZ")
SET(CPACK_SOURCE_IGNORE_FILES "/CVS/;/\\.svn/;/\\.bzr/;/\\.hg/;/\\.git/;\\.swp$;\\.#;/#")
-SET(CPACK_SOURCE_INSTALLED_DIRECTORIES "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0;/")
-SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake")
+SET(CPACK_SOURCE_INSTALLED_DIRECTORIES "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0;/")
+SET(CPACK_SOURCE_OUTPUT_CONFIG_FILE "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "log4cplus-1.1.0-Source")
SET(CPACK_SOURCE_TBZ2 "ON")
SET(CPACK_SOURCE_TGZ "ON")
-SET(CPACK_SOURCE_TOPLEVEL_TAG "Darwin-Source")
+SET(CPACK_SOURCE_TOPLEVEL_TAG "Linux-Source")
SET(CPACK_SOURCE_TZ "ON")
SET(CPACK_SOURCE_ZIP "OFF")
SET(CPACK_STRIP_FILES "")
-SET(CPACK_SYSTEM_NAME "Darwin")
-SET(CPACK_TOPLEVEL_TAG "Darwin-Source")
+SET(CPACK_SYSTEM_NAME "Linux")
+SET(CPACK_TOPLEVEL_TAG "Linux-Source")
diff --git a/resources/3rdparty/log4cplus-1.1.0/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/CTestTestfile.cmake
index b8d111d7a..5150b5df0 100644
--- a/resources/3rdparty/log4cplus-1.1.0/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/Makefile b/resources/3rdparty/log4cplus-1.1.0/Makefile
index a5ca950d1..3c5221df8 100644
--- a/resources/3rdparty/log4cplus-1.1.0/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- /opt/local/bin/cpack --config ./CPackConfig.cmake
+ /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,9 +140,9 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles/progress.marks
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles/progress.marks
$(MAKE) -f CMakeFiles/Makefile2 all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
diff --git a/resources/3rdparty/log4cplus-1.1.0/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/cmake_install.cmake
index 6ea288f9a..7e8fb7e21 100644
--- a/resources/3rdparty/log4cplus-1.1.0/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,11 +27,16 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/cmake_install.cmake")
ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY)
@@ -41,7 +46,7 @@ ELSE(CMAKE_INSTALL_COMPONENT)
SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt")
ENDIF(CMAKE_INSTALL_COMPONENT)
-FILE(WRITE "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/${CMAKE_INSTALL_MANIFEST}" "")
+FILE(WRITE "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/${CMAKE_INSTALL_MANIFEST}" "")
FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES})
- FILE(APPEND "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/${CMAKE_INSTALL_MANIFEST}" "${file}\n")
+ FILE(APPEND "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/${CMAKE_INSTALL_MANIFEST}" "${file}\n")
ENDFOREACH(file)
diff --git a/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config.h b/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config.h
index 76b72ea5e..2a9f7c12d 100644
--- a/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config.h
+++ b/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config.h
@@ -24,7 +24,7 @@
#define HAVE_GETADDRINFO 1
/* */
-/* #undef HAVE_GETHOSTBYNAME_R */
+#define HAVE_GETHOSTBYNAME_R 1
/* Define to 1 if you have the `getpid' function. */
#define HAVE_GETPID 1
@@ -69,10 +69,10 @@
/* #undef HAVE_LIBKERNEL32 */
/* Define to 1 if you have the `nsl' library (-lnsl). */
-/* #undef HAVE_LIBNSL */
+#define HAVE_LIBNSL 1
/* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
+#define HAVE_LIBRT 1
/* Define to 1 if you have the `socket' library (-lsocket). */
/* #undef HAVE_LIBSOCKET */
@@ -172,7 +172,7 @@
#define LOG4CPLUS_HAVE_C99_VARIADIC_MACROS 1
/* */
-/* #undef LOG4CPLUS_HAVE_CLOCK_GETTIME */
+#define LOG4CPLUS_HAVE_CLOCK_GETTIME 1
/* */
#define LOG4CPLUS_HAVE_ENAMETOOLONG 1
@@ -190,7 +190,7 @@
#define LOG4CPLUS_HAVE_GETADDRINFO 1
/* */
-/* #undef LOG4CPLUS_HAVE_GETHOSTBYNAME_R */
+#define LOG4CPLUS_HAVE_GETHOSTBYNAME_R 1
/* */
#define LOG4CPLUS_HAVE_GETPID 1
diff --git a/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config/defines.hxx b/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config/defines.hxx
index 1c7333642..a4803849e 100644
--- a/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config/defines.hxx
+++ b/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config/defines.hxx
@@ -74,7 +74,7 @@
#define LOG4CPLUS_HAVE_GETADDRINFO 1
/* */
-/* #undef LOG4CPLUS_HAVE_GETHOSTBYNAME_R */
+#define LOG4CPLUS_HAVE_GETHOSTBYNAME_R 1
/* */
#define LOG4CPLUS_HAVE_GETPID 1
@@ -83,13 +83,13 @@
#define LOG4CPLUS_HAVE_GETTIMEOFDAY 1
/* Define to 1 if you have the `clock_gettime' function. */
-/* #undef LOG4CPLUS_HAVE_CLOCK_GETTIME */
+#define LOG4CPLUS_HAVE_CLOCK_GETTIME 1
/* Define to 1 if you have the `nanosleep' function. */
#define LOG4CPLUS_HAVE_NANOSLEEP 1
/* Define to 1 if you have the `clock_nanosleep' function. */
-/* #undef LOG4CPLUS_HAVE_CLOCK_NANOSLEEP */
+#define LOG4CPLUS_HAVE_CLOCK_NANOSLEEP 1
/* */
#define LOG4CPLUS_HAVE_GMTIME_R 1
diff --git a/resources/3rdparty/log4cplus-1.1.0/loggingserver/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/loggingserver/CTestTestfile.cmake
index 7471e55bd..bb058519b 100644
--- a/resources/3rdparty/log4cplus-1.1.0/loggingserver/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/loggingserver/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/loggingserver/Makefile b/resources/3rdparty/log4cplus-1.1.0/loggingserver/Makefile
index e28bbd42c..ece665266 100644
--- a/resources/3rdparty/log4cplus-1.1.0/loggingserver/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/loggingserver/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
loggingserver/CMakeFiles/loggingserver.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/CMakeFiles/loggingserver.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 loggingserver/CMakeFiles/loggingserver.dir/rule
.PHONY : loggingserver/CMakeFiles/loggingserver.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ loggingserver: loggingserver/CMakeFiles/loggingserver.dir/rule
# fast build rule for target.
loggingserver/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/build
.PHONY : loggingserver/fast
loggingserver.o: loggingserver.cxx.o
@@ -191,7 +188,7 @@ loggingserver.o: loggingserver.cxx.o
# target to build an object file
loggingserver.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/loggingserver.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/loggingserver.cxx.o
.PHONY : loggingserver.cxx.o
loggingserver.i: loggingserver.cxx.i
@@ -199,7 +196,7 @@ loggingserver.i: loggingserver.cxx.i
# target to preprocess a source file
loggingserver.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/loggingserver.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/loggingserver.cxx.i
.PHONY : loggingserver.cxx.i
loggingserver.s: loggingserver.cxx.s
@@ -207,7 +204,7 @@ loggingserver.s: loggingserver.cxx.s
# target to generate assembly for a file
loggingserver.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/loggingserver.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f loggingserver/CMakeFiles/loggingserver.dir/build.make loggingserver/CMakeFiles/loggingserver.dir/loggingserver.cxx.s
.PHONY : loggingserver.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/loggingserver/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/loggingserver/cmake_install.cmake
index 7d87d8eb8..db2b04a5b 100644
--- a/resources/3rdparty/log4cplus-1.1.0/loggingserver/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/loggingserver/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,8 +27,19 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
- FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE EXECUTABLE FILES "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/loggingserver/loggingserver")
+ IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/loggingserver" AND
+ NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/loggingserver")
+ FILE(RPATH_CHECK
+ FILE "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/loggingserver"
+ RPATH "")
+ ENDIF()
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/bin" TYPE EXECUTABLE FILES "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/loggingserver/loggingserver")
IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/loggingserver" AND
NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/loggingserver")
IF(CMAKE_INSTALL_DO_STRIP)
diff --git a/resources/3rdparty/log4cplus-1.1.0/loggingserver/loggingserver b/resources/3rdparty/log4cplus-1.1.0/loggingserver/loggingserver
index 8a0eb3853..6e6cdc6c5 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/loggingserver/loggingserver and b/resources/3rdparty/log4cplus-1.1.0/loggingserver/loggingserver differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/src/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/src/CTestTestfile.cmake
index 3e7b3842d..37b9488b3 100644
--- a/resources/3rdparty/log4cplus-1.1.0/src/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/src/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/src/Makefile b/resources/3rdparty/log4cplus-1.1.0/src/Makefile
index db04080ea..bd0f3cb09 100644
--- a/resources/3rdparty/log4cplus-1.1.0/src/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/src/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
src/CMakeFiles/log4cplus.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/log4cplus.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 src/CMakeFiles/log4cplus.dir/rule
.PHONY : src/CMakeFiles/log4cplus.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ log4cplus: src/CMakeFiles/log4cplus.dir/rule
# fast build rule for target.
log4cplus/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/build
.PHONY : log4cplus/fast
appender.o: appender.cxx.o
@@ -191,7 +188,7 @@ appender.o: appender.cxx.o
# target to build an object file
appender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appender.cxx.o
.PHONY : appender.cxx.o
appender.i: appender.cxx.i
@@ -199,7 +196,7 @@ appender.i: appender.cxx.i
# target to preprocess a source file
appender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appender.cxx.i
.PHONY : appender.cxx.i
appender.s: appender.cxx.s
@@ -207,7 +204,7 @@ appender.s: appender.cxx.s
# target to generate assembly for a file
appender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appender.cxx.s
.PHONY : appender.cxx.s
appenderattachableimpl.o: appenderattachableimpl.cxx.o
@@ -215,7 +212,7 @@ appenderattachableimpl.o: appenderattachableimpl.cxx.o
# target to build an object file
appenderattachableimpl.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appenderattachableimpl.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appenderattachableimpl.cxx.o
.PHONY : appenderattachableimpl.cxx.o
appenderattachableimpl.i: appenderattachableimpl.cxx.i
@@ -223,7 +220,7 @@ appenderattachableimpl.i: appenderattachableimpl.cxx.i
# target to preprocess a source file
appenderattachableimpl.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appenderattachableimpl.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appenderattachableimpl.cxx.i
.PHONY : appenderattachableimpl.cxx.i
appenderattachableimpl.s: appenderattachableimpl.cxx.s
@@ -231,7 +228,7 @@ appenderattachableimpl.s: appenderattachableimpl.cxx.s
# target to generate assembly for a file
appenderattachableimpl.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appenderattachableimpl.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/appenderattachableimpl.cxx.s
.PHONY : appenderattachableimpl.cxx.s
asyncappender.o: asyncappender.cxx.o
@@ -239,7 +236,7 @@ asyncappender.o: asyncappender.cxx.o
# target to build an object file
asyncappender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/asyncappender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/asyncappender.cxx.o
.PHONY : asyncappender.cxx.o
asyncappender.i: asyncappender.cxx.i
@@ -247,7 +244,7 @@ asyncappender.i: asyncappender.cxx.i
# target to preprocess a source file
asyncappender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/asyncappender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/asyncappender.cxx.i
.PHONY : asyncappender.cxx.i
asyncappender.s: asyncappender.cxx.s
@@ -255,7 +252,7 @@ asyncappender.s: asyncappender.cxx.s
# target to generate assembly for a file
asyncappender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/asyncappender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/asyncappender.cxx.s
.PHONY : asyncappender.cxx.s
clogger.o: clogger.cxx.o
@@ -263,7 +260,7 @@ clogger.o: clogger.cxx.o
# target to build an object file
clogger.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/clogger.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/clogger.cxx.o
.PHONY : clogger.cxx.o
clogger.i: clogger.cxx.i
@@ -271,7 +268,7 @@ clogger.i: clogger.cxx.i
# target to preprocess a source file
clogger.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/clogger.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/clogger.cxx.i
.PHONY : clogger.cxx.i
clogger.s: clogger.cxx.s
@@ -279,7 +276,7 @@ clogger.s: clogger.cxx.s
# target to generate assembly for a file
clogger.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/clogger.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/clogger.cxx.s
.PHONY : clogger.cxx.s
configurator.o: configurator.cxx.o
@@ -287,7 +284,7 @@ configurator.o: configurator.cxx.o
# target to build an object file
configurator.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/configurator.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/configurator.cxx.o
.PHONY : configurator.cxx.o
configurator.i: configurator.cxx.i
@@ -295,7 +292,7 @@ configurator.i: configurator.cxx.i
# target to preprocess a source file
configurator.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/configurator.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/configurator.cxx.i
.PHONY : configurator.cxx.i
configurator.s: configurator.cxx.s
@@ -303,7 +300,7 @@ configurator.s: configurator.cxx.s
# target to generate assembly for a file
configurator.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/configurator.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/configurator.cxx.s
.PHONY : configurator.cxx.s
consoleappender.o: consoleappender.cxx.o
@@ -311,7 +308,7 @@ consoleappender.o: consoleappender.cxx.o
# target to build an object file
consoleappender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/consoleappender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/consoleappender.cxx.o
.PHONY : consoleappender.cxx.o
consoleappender.i: consoleappender.cxx.i
@@ -319,7 +316,7 @@ consoleappender.i: consoleappender.cxx.i
# target to preprocess a source file
consoleappender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/consoleappender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/consoleappender.cxx.i
.PHONY : consoleappender.cxx.i
consoleappender.s: consoleappender.cxx.s
@@ -327,7 +324,7 @@ consoleappender.s: consoleappender.cxx.s
# target to generate assembly for a file
consoleappender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/consoleappender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/consoleappender.cxx.s
.PHONY : consoleappender.cxx.s
cygwin-win32.o: cygwin-win32.cxx.o
@@ -335,7 +332,7 @@ cygwin-win32.o: cygwin-win32.cxx.o
# target to build an object file
cygwin-win32.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/cygwin-win32.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/cygwin-win32.cxx.o
.PHONY : cygwin-win32.cxx.o
cygwin-win32.i: cygwin-win32.cxx.i
@@ -343,7 +340,7 @@ cygwin-win32.i: cygwin-win32.cxx.i
# target to preprocess a source file
cygwin-win32.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/cygwin-win32.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/cygwin-win32.cxx.i
.PHONY : cygwin-win32.cxx.i
cygwin-win32.s: cygwin-win32.cxx.s
@@ -351,7 +348,7 @@ cygwin-win32.s: cygwin-win32.cxx.s
# target to generate assembly for a file
cygwin-win32.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/cygwin-win32.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/cygwin-win32.cxx.s
.PHONY : cygwin-win32.cxx.s
env.o: env.cxx.o
@@ -359,7 +356,7 @@ env.o: env.cxx.o
# target to build an object file
env.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/env.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/env.cxx.o
.PHONY : env.cxx.o
env.i: env.cxx.i
@@ -367,7 +364,7 @@ env.i: env.cxx.i
# target to preprocess a source file
env.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/env.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/env.cxx.i
.PHONY : env.cxx.i
env.s: env.cxx.s
@@ -375,7 +372,7 @@ env.s: env.cxx.s
# target to generate assembly for a file
env.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/env.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/env.cxx.s
.PHONY : env.cxx.s
factory.o: factory.cxx.o
@@ -383,7 +380,7 @@ factory.o: factory.cxx.o
# target to build an object file
factory.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/factory.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/factory.cxx.o
.PHONY : factory.cxx.o
factory.i: factory.cxx.i
@@ -391,7 +388,7 @@ factory.i: factory.cxx.i
# target to preprocess a source file
factory.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/factory.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/factory.cxx.i
.PHONY : factory.cxx.i
factory.s: factory.cxx.s
@@ -399,7 +396,7 @@ factory.s: factory.cxx.s
# target to generate assembly for a file
factory.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/factory.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/factory.cxx.s
.PHONY : factory.cxx.s
fileappender.o: fileappender.cxx.o
@@ -407,7 +404,7 @@ fileappender.o: fileappender.cxx.o
# target to build an object file
fileappender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileappender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileappender.cxx.o
.PHONY : fileappender.cxx.o
fileappender.i: fileappender.cxx.i
@@ -415,7 +412,7 @@ fileappender.i: fileappender.cxx.i
# target to preprocess a source file
fileappender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileappender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileappender.cxx.i
.PHONY : fileappender.cxx.i
fileappender.s: fileappender.cxx.s
@@ -423,7 +420,7 @@ fileappender.s: fileappender.cxx.s
# target to generate assembly for a file
fileappender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileappender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileappender.cxx.s
.PHONY : fileappender.cxx.s
fileinfo.o: fileinfo.cxx.o
@@ -431,7 +428,7 @@ fileinfo.o: fileinfo.cxx.o
# target to build an object file
fileinfo.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileinfo.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileinfo.cxx.o
.PHONY : fileinfo.cxx.o
fileinfo.i: fileinfo.cxx.i
@@ -439,7 +436,7 @@ fileinfo.i: fileinfo.cxx.i
# target to preprocess a source file
fileinfo.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileinfo.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileinfo.cxx.i
.PHONY : fileinfo.cxx.i
fileinfo.s: fileinfo.cxx.s
@@ -447,7 +444,7 @@ fileinfo.s: fileinfo.cxx.s
# target to generate assembly for a file
fileinfo.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileinfo.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/fileinfo.cxx.s
.PHONY : fileinfo.cxx.s
filter.o: filter.cxx.o
@@ -455,7 +452,7 @@ filter.o: filter.cxx.o
# target to build an object file
filter.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/filter.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/filter.cxx.o
.PHONY : filter.cxx.o
filter.i: filter.cxx.i
@@ -463,7 +460,7 @@ filter.i: filter.cxx.i
# target to preprocess a source file
filter.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/filter.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/filter.cxx.i
.PHONY : filter.cxx.i
filter.s: filter.cxx.s
@@ -471,7 +468,7 @@ filter.s: filter.cxx.s
# target to generate assembly for a file
filter.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/filter.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/filter.cxx.s
.PHONY : filter.cxx.s
global-init.o: global-init.cxx.o
@@ -479,7 +476,7 @@ global-init.o: global-init.cxx.o
# target to build an object file
global-init.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/global-init.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/global-init.cxx.o
.PHONY : global-init.cxx.o
global-init.i: global-init.cxx.i
@@ -487,7 +484,7 @@ global-init.i: global-init.cxx.i
# target to preprocess a source file
global-init.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/global-init.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/global-init.cxx.i
.PHONY : global-init.cxx.i
global-init.s: global-init.cxx.s
@@ -495,7 +492,7 @@ global-init.s: global-init.cxx.s
# target to generate assembly for a file
global-init.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/global-init.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/global-init.cxx.s
.PHONY : global-init.cxx.s
hierarchy.o: hierarchy.cxx.o
@@ -503,7 +500,7 @@ hierarchy.o: hierarchy.cxx.o
# target to build an object file
hierarchy.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchy.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchy.cxx.o
.PHONY : hierarchy.cxx.o
hierarchy.i: hierarchy.cxx.i
@@ -511,7 +508,7 @@ hierarchy.i: hierarchy.cxx.i
# target to preprocess a source file
hierarchy.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchy.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchy.cxx.i
.PHONY : hierarchy.cxx.i
hierarchy.s: hierarchy.cxx.s
@@ -519,7 +516,7 @@ hierarchy.s: hierarchy.cxx.s
# target to generate assembly for a file
hierarchy.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchy.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchy.cxx.s
.PHONY : hierarchy.cxx.s
hierarchylocker.o: hierarchylocker.cxx.o
@@ -527,7 +524,7 @@ hierarchylocker.o: hierarchylocker.cxx.o
# target to build an object file
hierarchylocker.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchylocker.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchylocker.cxx.o
.PHONY : hierarchylocker.cxx.o
hierarchylocker.i: hierarchylocker.cxx.i
@@ -535,7 +532,7 @@ hierarchylocker.i: hierarchylocker.cxx.i
# target to preprocess a source file
hierarchylocker.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchylocker.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchylocker.cxx.i
.PHONY : hierarchylocker.cxx.i
hierarchylocker.s: hierarchylocker.cxx.s
@@ -543,7 +540,7 @@ hierarchylocker.s: hierarchylocker.cxx.s
# target to generate assembly for a file
hierarchylocker.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchylocker.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/hierarchylocker.cxx.s
.PHONY : hierarchylocker.cxx.s
layout.o: layout.cxx.o
@@ -551,7 +548,7 @@ layout.o: layout.cxx.o
# target to build an object file
layout.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/layout.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/layout.cxx.o
.PHONY : layout.cxx.o
layout.i: layout.cxx.i
@@ -559,7 +556,7 @@ layout.i: layout.cxx.i
# target to preprocess a source file
layout.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/layout.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/layout.cxx.i
.PHONY : layout.cxx.i
layout.s: layout.cxx.s
@@ -567,7 +564,7 @@ layout.s: layout.cxx.s
# target to generate assembly for a file
layout.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/layout.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/layout.cxx.s
.PHONY : layout.cxx.s
lockfile.o: lockfile.cxx.o
@@ -575,7 +572,7 @@ lockfile.o: lockfile.cxx.o
# target to build an object file
lockfile.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/lockfile.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/lockfile.cxx.o
.PHONY : lockfile.cxx.o
lockfile.i: lockfile.cxx.i
@@ -583,7 +580,7 @@ lockfile.i: lockfile.cxx.i
# target to preprocess a source file
lockfile.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/lockfile.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/lockfile.cxx.i
.PHONY : lockfile.cxx.i
lockfile.s: lockfile.cxx.s
@@ -591,7 +588,7 @@ lockfile.s: lockfile.cxx.s
# target to generate assembly for a file
lockfile.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/lockfile.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/lockfile.cxx.s
.PHONY : lockfile.cxx.s
log4judpappender.o: log4judpappender.cxx.o
@@ -599,7 +596,7 @@ log4judpappender.o: log4judpappender.cxx.o
# target to build an object file
log4judpappender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/log4judpappender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/log4judpappender.cxx.o
.PHONY : log4judpappender.cxx.o
log4judpappender.i: log4judpappender.cxx.i
@@ -607,7 +604,7 @@ log4judpappender.i: log4judpappender.cxx.i
# target to preprocess a source file
log4judpappender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/log4judpappender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/log4judpappender.cxx.i
.PHONY : log4judpappender.cxx.i
log4judpappender.s: log4judpappender.cxx.s
@@ -615,7 +612,7 @@ log4judpappender.s: log4judpappender.cxx.s
# target to generate assembly for a file
log4judpappender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/log4judpappender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/log4judpappender.cxx.s
.PHONY : log4judpappender.cxx.s
logger.o: logger.cxx.o
@@ -623,7 +620,7 @@ logger.o: logger.cxx.o
# target to build an object file
logger.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logger.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logger.cxx.o
.PHONY : logger.cxx.o
logger.i: logger.cxx.i
@@ -631,7 +628,7 @@ logger.i: logger.cxx.i
# target to preprocess a source file
logger.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logger.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logger.cxx.i
.PHONY : logger.cxx.i
logger.s: logger.cxx.s
@@ -639,7 +636,7 @@ logger.s: logger.cxx.s
# target to generate assembly for a file
logger.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logger.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logger.cxx.s
.PHONY : logger.cxx.s
loggerimpl.o: loggerimpl.cxx.o
@@ -647,7 +644,7 @@ loggerimpl.o: loggerimpl.cxx.o
# target to build an object file
loggerimpl.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggerimpl.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggerimpl.cxx.o
.PHONY : loggerimpl.cxx.o
loggerimpl.i: loggerimpl.cxx.i
@@ -655,7 +652,7 @@ loggerimpl.i: loggerimpl.cxx.i
# target to preprocess a source file
loggerimpl.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggerimpl.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggerimpl.cxx.i
.PHONY : loggerimpl.cxx.i
loggerimpl.s: loggerimpl.cxx.s
@@ -663,7 +660,7 @@ loggerimpl.s: loggerimpl.cxx.s
# target to generate assembly for a file
loggerimpl.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggerimpl.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggerimpl.cxx.s
.PHONY : loggerimpl.cxx.s
loggingevent.o: loggingevent.cxx.o
@@ -671,7 +668,7 @@ loggingevent.o: loggingevent.cxx.o
# target to build an object file
loggingevent.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingevent.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingevent.cxx.o
.PHONY : loggingevent.cxx.o
loggingevent.i: loggingevent.cxx.i
@@ -679,7 +676,7 @@ loggingevent.i: loggingevent.cxx.i
# target to preprocess a source file
loggingevent.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingevent.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingevent.cxx.i
.PHONY : loggingevent.cxx.i
loggingevent.s: loggingevent.cxx.s
@@ -687,7 +684,7 @@ loggingevent.s: loggingevent.cxx.s
# target to generate assembly for a file
loggingevent.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingevent.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingevent.cxx.s
.PHONY : loggingevent.cxx.s
loggingmacros.o: loggingmacros.cxx.o
@@ -695,7 +692,7 @@ loggingmacros.o: loggingmacros.cxx.o
# target to build an object file
loggingmacros.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingmacros.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingmacros.cxx.o
.PHONY : loggingmacros.cxx.o
loggingmacros.i: loggingmacros.cxx.i
@@ -703,7 +700,7 @@ loggingmacros.i: loggingmacros.cxx.i
# target to preprocess a source file
loggingmacros.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingmacros.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingmacros.cxx.i
.PHONY : loggingmacros.cxx.i
loggingmacros.s: loggingmacros.cxx.s
@@ -711,7 +708,7 @@ loggingmacros.s: loggingmacros.cxx.s
# target to generate assembly for a file
loggingmacros.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingmacros.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loggingmacros.cxx.s
.PHONY : loggingmacros.cxx.s
loglevel.o: loglevel.cxx.o
@@ -719,7 +716,7 @@ loglevel.o: loglevel.cxx.o
# target to build an object file
loglevel.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglevel.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglevel.cxx.o
.PHONY : loglevel.cxx.o
loglevel.i: loglevel.cxx.i
@@ -727,7 +724,7 @@ loglevel.i: loglevel.cxx.i
# target to preprocess a source file
loglevel.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglevel.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglevel.cxx.i
.PHONY : loglevel.cxx.i
loglevel.s: loglevel.cxx.s
@@ -735,7 +732,7 @@ loglevel.s: loglevel.cxx.s
# target to generate assembly for a file
loglevel.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglevel.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglevel.cxx.s
.PHONY : loglevel.cxx.s
loglog.o: loglog.cxx.o
@@ -743,7 +740,7 @@ loglog.o: loglog.cxx.o
# target to build an object file
loglog.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglog.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglog.cxx.o
.PHONY : loglog.cxx.o
loglog.i: loglog.cxx.i
@@ -751,7 +748,7 @@ loglog.i: loglog.cxx.i
# target to preprocess a source file
loglog.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglog.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglog.cxx.i
.PHONY : loglog.cxx.i
loglog.s: loglog.cxx.s
@@ -759,7 +756,7 @@ loglog.s: loglog.cxx.s
# target to generate assembly for a file
loglog.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglog.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/loglog.cxx.s
.PHONY : loglog.cxx.s
logloguser.o: logloguser.cxx.o
@@ -767,7 +764,7 @@ logloguser.o: logloguser.cxx.o
# target to build an object file
logloguser.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logloguser.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logloguser.cxx.o
.PHONY : logloguser.cxx.o
logloguser.i: logloguser.cxx.i
@@ -775,7 +772,7 @@ logloguser.i: logloguser.cxx.i
# target to preprocess a source file
logloguser.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logloguser.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logloguser.cxx.i
.PHONY : logloguser.cxx.i
logloguser.s: logloguser.cxx.s
@@ -783,7 +780,7 @@ logloguser.s: logloguser.cxx.s
# target to generate assembly for a file
logloguser.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logloguser.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/logloguser.cxx.s
.PHONY : logloguser.cxx.s
mdc.o: mdc.cxx.o
@@ -791,7 +788,7 @@ mdc.o: mdc.cxx.o
# target to build an object file
mdc.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/mdc.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/mdc.cxx.o
.PHONY : mdc.cxx.o
mdc.i: mdc.cxx.i
@@ -799,7 +796,7 @@ mdc.i: mdc.cxx.i
# target to preprocess a source file
mdc.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/mdc.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/mdc.cxx.i
.PHONY : mdc.cxx.i
mdc.s: mdc.cxx.s
@@ -807,7 +804,7 @@ mdc.s: mdc.cxx.s
# target to generate assembly for a file
mdc.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/mdc.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/mdc.cxx.s
.PHONY : mdc.cxx.s
ndc.o: ndc.cxx.o
@@ -815,7 +812,7 @@ ndc.o: ndc.cxx.o
# target to build an object file
ndc.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/ndc.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/ndc.cxx.o
.PHONY : ndc.cxx.o
ndc.i: ndc.cxx.i
@@ -823,7 +820,7 @@ ndc.i: ndc.cxx.i
# target to preprocess a source file
ndc.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/ndc.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/ndc.cxx.i
.PHONY : ndc.cxx.i
ndc.s: ndc.cxx.s
@@ -831,7 +828,7 @@ ndc.s: ndc.cxx.s
# target to generate assembly for a file
ndc.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/ndc.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/ndc.cxx.s
.PHONY : ndc.cxx.s
nullappender.o: nullappender.cxx.o
@@ -839,7 +836,7 @@ nullappender.o: nullappender.cxx.o
# target to build an object file
nullappender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/nullappender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/nullappender.cxx.o
.PHONY : nullappender.cxx.o
nullappender.i: nullappender.cxx.i
@@ -847,7 +844,7 @@ nullappender.i: nullappender.cxx.i
# target to preprocess a source file
nullappender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/nullappender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/nullappender.cxx.i
.PHONY : nullappender.cxx.i
nullappender.s: nullappender.cxx.s
@@ -855,7 +852,7 @@ nullappender.s: nullappender.cxx.s
# target to generate assembly for a file
nullappender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/nullappender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/nullappender.cxx.s
.PHONY : nullappender.cxx.s
objectregistry.o: objectregistry.cxx.o
@@ -863,7 +860,7 @@ objectregistry.o: objectregistry.cxx.o
# target to build an object file
objectregistry.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/objectregistry.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/objectregistry.cxx.o
.PHONY : objectregistry.cxx.o
objectregistry.i: objectregistry.cxx.i
@@ -871,7 +868,7 @@ objectregistry.i: objectregistry.cxx.i
# target to preprocess a source file
objectregistry.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/objectregistry.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/objectregistry.cxx.i
.PHONY : objectregistry.cxx.i
objectregistry.s: objectregistry.cxx.s
@@ -879,7 +876,7 @@ objectregistry.s: objectregistry.cxx.s
# target to generate assembly for a file
objectregistry.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/objectregistry.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/objectregistry.cxx.s
.PHONY : objectregistry.cxx.s
patternlayout.o: patternlayout.cxx.o
@@ -887,7 +884,7 @@ patternlayout.o: patternlayout.cxx.o
# target to build an object file
patternlayout.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/patternlayout.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/patternlayout.cxx.o
.PHONY : patternlayout.cxx.o
patternlayout.i: patternlayout.cxx.i
@@ -895,7 +892,7 @@ patternlayout.i: patternlayout.cxx.i
# target to preprocess a source file
patternlayout.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/patternlayout.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/patternlayout.cxx.i
.PHONY : patternlayout.cxx.i
patternlayout.s: patternlayout.cxx.s
@@ -903,7 +900,7 @@ patternlayout.s: patternlayout.cxx.s
# target to generate assembly for a file
patternlayout.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/patternlayout.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/patternlayout.cxx.s
.PHONY : patternlayout.cxx.s
pointer.o: pointer.cxx.o
@@ -911,7 +908,7 @@ pointer.o: pointer.cxx.o
# target to build an object file
pointer.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/pointer.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/pointer.cxx.o
.PHONY : pointer.cxx.o
pointer.i: pointer.cxx.i
@@ -919,7 +916,7 @@ pointer.i: pointer.cxx.i
# target to preprocess a source file
pointer.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/pointer.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/pointer.cxx.i
.PHONY : pointer.cxx.i
pointer.s: pointer.cxx.s
@@ -927,7 +924,7 @@ pointer.s: pointer.cxx.s
# target to generate assembly for a file
pointer.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/pointer.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/pointer.cxx.s
.PHONY : pointer.cxx.s
property.o: property.cxx.o
@@ -935,7 +932,7 @@ property.o: property.cxx.o
# target to build an object file
property.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/property.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/property.cxx.o
.PHONY : property.cxx.o
property.i: property.cxx.i
@@ -943,7 +940,7 @@ property.i: property.cxx.i
# target to preprocess a source file
property.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/property.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/property.cxx.i
.PHONY : property.cxx.i
property.s: property.cxx.s
@@ -951,7 +948,7 @@ property.s: property.cxx.s
# target to generate assembly for a file
property.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/property.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/property.cxx.s
.PHONY : property.cxx.s
queue.o: queue.cxx.o
@@ -959,7 +956,7 @@ queue.o: queue.cxx.o
# target to build an object file
queue.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/queue.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/queue.cxx.o
.PHONY : queue.cxx.o
queue.i: queue.cxx.i
@@ -967,7 +964,7 @@ queue.i: queue.cxx.i
# target to preprocess a source file
queue.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/queue.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/queue.cxx.i
.PHONY : queue.cxx.i
queue.s: queue.cxx.s
@@ -975,7 +972,7 @@ queue.s: queue.cxx.s
# target to generate assembly for a file
queue.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/queue.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/queue.cxx.s
.PHONY : queue.cxx.s
rootlogger.o: rootlogger.cxx.o
@@ -983,7 +980,7 @@ rootlogger.o: rootlogger.cxx.o
# target to build an object file
rootlogger.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/rootlogger.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/rootlogger.cxx.o
.PHONY : rootlogger.cxx.o
rootlogger.i: rootlogger.cxx.i
@@ -991,7 +988,7 @@ rootlogger.i: rootlogger.cxx.i
# target to preprocess a source file
rootlogger.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/rootlogger.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/rootlogger.cxx.i
.PHONY : rootlogger.cxx.i
rootlogger.s: rootlogger.cxx.s
@@ -999,7 +996,7 @@ rootlogger.s: rootlogger.cxx.s
# target to generate assembly for a file
rootlogger.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/rootlogger.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/rootlogger.cxx.s
.PHONY : rootlogger.cxx.s
sleep.o: sleep.cxx.o
@@ -1007,7 +1004,7 @@ sleep.o: sleep.cxx.o
# target to build an object file
sleep.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/sleep.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/sleep.cxx.o
.PHONY : sleep.cxx.o
sleep.i: sleep.cxx.i
@@ -1015,7 +1012,7 @@ sleep.i: sleep.cxx.i
# target to preprocess a source file
sleep.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/sleep.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/sleep.cxx.i
.PHONY : sleep.cxx.i
sleep.s: sleep.cxx.s
@@ -1023,7 +1020,7 @@ sleep.s: sleep.cxx.s
# target to generate assembly for a file
sleep.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/sleep.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/sleep.cxx.s
.PHONY : sleep.cxx.s
snprintf.o: snprintf.cxx.o
@@ -1031,7 +1028,7 @@ snprintf.o: snprintf.cxx.o
# target to build an object file
snprintf.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/snprintf.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/snprintf.cxx.o
.PHONY : snprintf.cxx.o
snprintf.i: snprintf.cxx.i
@@ -1039,7 +1036,7 @@ snprintf.i: snprintf.cxx.i
# target to preprocess a source file
snprintf.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/snprintf.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/snprintf.cxx.i
.PHONY : snprintf.cxx.i
snprintf.s: snprintf.cxx.s
@@ -1047,7 +1044,7 @@ snprintf.s: snprintf.cxx.s
# target to generate assembly for a file
snprintf.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/snprintf.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/snprintf.cxx.s
.PHONY : snprintf.cxx.s
socket-unix.o: socket-unix.cxx.o
@@ -1055,7 +1052,7 @@ socket-unix.o: socket-unix.cxx.o
# target to build an object file
socket-unix.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket-unix.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket-unix.cxx.o
.PHONY : socket-unix.cxx.o
socket-unix.i: socket-unix.cxx.i
@@ -1063,7 +1060,7 @@ socket-unix.i: socket-unix.cxx.i
# target to preprocess a source file
socket-unix.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket-unix.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket-unix.cxx.i
.PHONY : socket-unix.cxx.i
socket-unix.s: socket-unix.cxx.s
@@ -1071,7 +1068,7 @@ socket-unix.s: socket-unix.cxx.s
# target to generate assembly for a file
socket-unix.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket-unix.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket-unix.cxx.s
.PHONY : socket-unix.cxx.s
socket.o: socket.cxx.o
@@ -1079,7 +1076,7 @@ socket.o: socket.cxx.o
# target to build an object file
socket.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket.cxx.o
.PHONY : socket.cxx.o
socket.i: socket.cxx.i
@@ -1087,7 +1084,7 @@ socket.i: socket.cxx.i
# target to preprocess a source file
socket.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket.cxx.i
.PHONY : socket.cxx.i
socket.s: socket.cxx.s
@@ -1095,7 +1092,7 @@ socket.s: socket.cxx.s
# target to generate assembly for a file
socket.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socket.cxx.s
.PHONY : socket.cxx.s
socketappender.o: socketappender.cxx.o
@@ -1103,7 +1100,7 @@ socketappender.o: socketappender.cxx.o
# target to build an object file
socketappender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketappender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketappender.cxx.o
.PHONY : socketappender.cxx.o
socketappender.i: socketappender.cxx.i
@@ -1111,7 +1108,7 @@ socketappender.i: socketappender.cxx.i
# target to preprocess a source file
socketappender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketappender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketappender.cxx.i
.PHONY : socketappender.cxx.i
socketappender.s: socketappender.cxx.s
@@ -1119,7 +1116,7 @@ socketappender.s: socketappender.cxx.s
# target to generate assembly for a file
socketappender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketappender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketappender.cxx.s
.PHONY : socketappender.cxx.s
socketbuffer.o: socketbuffer.cxx.o
@@ -1127,7 +1124,7 @@ socketbuffer.o: socketbuffer.cxx.o
# target to build an object file
socketbuffer.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketbuffer.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketbuffer.cxx.o
.PHONY : socketbuffer.cxx.o
socketbuffer.i: socketbuffer.cxx.i
@@ -1135,7 +1132,7 @@ socketbuffer.i: socketbuffer.cxx.i
# target to preprocess a source file
socketbuffer.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketbuffer.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketbuffer.cxx.i
.PHONY : socketbuffer.cxx.i
socketbuffer.s: socketbuffer.cxx.s
@@ -1143,7 +1140,7 @@ socketbuffer.s: socketbuffer.cxx.s
# target to generate assembly for a file
socketbuffer.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketbuffer.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/socketbuffer.cxx.s
.PHONY : socketbuffer.cxx.s
stringhelper-clocale.o: stringhelper-clocale.cxx.o
@@ -1151,7 +1148,7 @@ stringhelper-clocale.o: stringhelper-clocale.cxx.o
# target to build an object file
stringhelper-clocale.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-clocale.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-clocale.cxx.o
.PHONY : stringhelper-clocale.cxx.o
stringhelper-clocale.i: stringhelper-clocale.cxx.i
@@ -1159,7 +1156,7 @@ stringhelper-clocale.i: stringhelper-clocale.cxx.i
# target to preprocess a source file
stringhelper-clocale.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-clocale.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-clocale.cxx.i
.PHONY : stringhelper-clocale.cxx.i
stringhelper-clocale.s: stringhelper-clocale.cxx.s
@@ -1167,7 +1164,7 @@ stringhelper-clocale.s: stringhelper-clocale.cxx.s
# target to generate assembly for a file
stringhelper-clocale.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-clocale.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-clocale.cxx.s
.PHONY : stringhelper-clocale.cxx.s
stringhelper-cxxlocale.o: stringhelper-cxxlocale.cxx.o
@@ -1175,7 +1172,7 @@ stringhelper-cxxlocale.o: stringhelper-cxxlocale.cxx.o
# target to build an object file
stringhelper-cxxlocale.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-cxxlocale.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-cxxlocale.cxx.o
.PHONY : stringhelper-cxxlocale.cxx.o
stringhelper-cxxlocale.i: stringhelper-cxxlocale.cxx.i
@@ -1183,7 +1180,7 @@ stringhelper-cxxlocale.i: stringhelper-cxxlocale.cxx.i
# target to preprocess a source file
stringhelper-cxxlocale.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-cxxlocale.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-cxxlocale.cxx.i
.PHONY : stringhelper-cxxlocale.cxx.i
stringhelper-cxxlocale.s: stringhelper-cxxlocale.cxx.s
@@ -1191,7 +1188,7 @@ stringhelper-cxxlocale.s: stringhelper-cxxlocale.cxx.s
# target to generate assembly for a file
stringhelper-cxxlocale.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-cxxlocale.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-cxxlocale.cxx.s
.PHONY : stringhelper-cxxlocale.cxx.s
stringhelper-iconv.o: stringhelper-iconv.cxx.o
@@ -1199,7 +1196,7 @@ stringhelper-iconv.o: stringhelper-iconv.cxx.o
# target to build an object file
stringhelper-iconv.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-iconv.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-iconv.cxx.o
.PHONY : stringhelper-iconv.cxx.o
stringhelper-iconv.i: stringhelper-iconv.cxx.i
@@ -1207,7 +1204,7 @@ stringhelper-iconv.i: stringhelper-iconv.cxx.i
# target to preprocess a source file
stringhelper-iconv.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-iconv.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-iconv.cxx.i
.PHONY : stringhelper-iconv.cxx.i
stringhelper-iconv.s: stringhelper-iconv.cxx.s
@@ -1215,7 +1212,7 @@ stringhelper-iconv.s: stringhelper-iconv.cxx.s
# target to generate assembly for a file
stringhelper-iconv.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-iconv.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper-iconv.cxx.s
.PHONY : stringhelper-iconv.cxx.s
stringhelper.o: stringhelper.cxx.o
@@ -1223,7 +1220,7 @@ stringhelper.o: stringhelper.cxx.o
# target to build an object file
stringhelper.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper.cxx.o
.PHONY : stringhelper.cxx.o
stringhelper.i: stringhelper.cxx.i
@@ -1231,7 +1228,7 @@ stringhelper.i: stringhelper.cxx.i
# target to preprocess a source file
stringhelper.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper.cxx.i
.PHONY : stringhelper.cxx.i
stringhelper.s: stringhelper.cxx.s
@@ -1239,7 +1236,7 @@ stringhelper.s: stringhelper.cxx.s
# target to generate assembly for a file
stringhelper.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/stringhelper.cxx.s
.PHONY : stringhelper.cxx.s
syncprims.o: syncprims.cxx.o
@@ -1247,7 +1244,7 @@ syncprims.o: syncprims.cxx.o
# target to build an object file
syncprims.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syncprims.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syncprims.cxx.o
.PHONY : syncprims.cxx.o
syncprims.i: syncprims.cxx.i
@@ -1255,7 +1252,7 @@ syncprims.i: syncprims.cxx.i
# target to preprocess a source file
syncprims.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syncprims.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syncprims.cxx.i
.PHONY : syncprims.cxx.i
syncprims.s: syncprims.cxx.s
@@ -1263,7 +1260,7 @@ syncprims.s: syncprims.cxx.s
# target to generate assembly for a file
syncprims.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syncprims.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syncprims.cxx.s
.PHONY : syncprims.cxx.s
syslogappender.o: syslogappender.cxx.o
@@ -1271,7 +1268,7 @@ syslogappender.o: syslogappender.cxx.o
# target to build an object file
syslogappender.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syslogappender.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syslogappender.cxx.o
.PHONY : syslogappender.cxx.o
syslogappender.i: syslogappender.cxx.i
@@ -1279,7 +1276,7 @@ syslogappender.i: syslogappender.cxx.i
# target to preprocess a source file
syslogappender.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syslogappender.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syslogappender.cxx.i
.PHONY : syslogappender.cxx.i
syslogappender.s: syslogappender.cxx.s
@@ -1287,7 +1284,7 @@ syslogappender.s: syslogappender.cxx.s
# target to generate assembly for a file
syslogappender.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syslogappender.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/syslogappender.cxx.s
.PHONY : syslogappender.cxx.s
threads.o: threads.cxx.o
@@ -1295,7 +1292,7 @@ threads.o: threads.cxx.o
# target to build an object file
threads.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/threads.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/threads.cxx.o
.PHONY : threads.cxx.o
threads.i: threads.cxx.i
@@ -1303,7 +1300,7 @@ threads.i: threads.cxx.i
# target to preprocess a source file
threads.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/threads.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/threads.cxx.i
.PHONY : threads.cxx.i
threads.s: threads.cxx.s
@@ -1311,7 +1308,7 @@ threads.s: threads.cxx.s
# target to generate assembly for a file
threads.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/threads.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/threads.cxx.s
.PHONY : threads.cxx.s
timehelper.o: timehelper.cxx.o
@@ -1319,7 +1316,7 @@ timehelper.o: timehelper.cxx.o
# target to build an object file
timehelper.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/timehelper.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/timehelper.cxx.o
.PHONY : timehelper.cxx.o
timehelper.i: timehelper.cxx.i
@@ -1327,7 +1324,7 @@ timehelper.i: timehelper.cxx.i
# target to preprocess a source file
timehelper.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/timehelper.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/timehelper.cxx.i
.PHONY : timehelper.cxx.i
timehelper.s: timehelper.cxx.s
@@ -1335,7 +1332,7 @@ timehelper.s: timehelper.cxx.s
# target to generate assembly for a file
timehelper.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/timehelper.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/timehelper.cxx.s
.PHONY : timehelper.cxx.s
tls.o: tls.cxx.o
@@ -1343,7 +1340,7 @@ tls.o: tls.cxx.o
# target to build an object file
tls.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/tls.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/tls.cxx.o
.PHONY : tls.cxx.o
tls.i: tls.cxx.i
@@ -1351,7 +1348,7 @@ tls.i: tls.cxx.i
# target to preprocess a source file
tls.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/tls.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/tls.cxx.i
.PHONY : tls.cxx.i
tls.s: tls.cxx.s
@@ -1359,7 +1356,7 @@ tls.s: tls.cxx.s
# target to generate assembly for a file
tls.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/tls.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/tls.cxx.s
.PHONY : tls.cxx.s
version.o: version.cxx.o
@@ -1367,7 +1364,7 @@ version.o: version.cxx.o
# target to build an object file
version.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/version.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/version.cxx.o
.PHONY : version.cxx.o
version.i: version.cxx.i
@@ -1375,7 +1372,7 @@ version.i: version.cxx.i
# target to preprocess a source file
version.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/version.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/version.cxx.i
.PHONY : version.cxx.i
version.s: version.cxx.s
@@ -1383,7 +1380,7 @@ version.s: version.cxx.s
# target to generate assembly for a file
version.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/version.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f src/CMakeFiles/log4cplus.dir/build.make src/CMakeFiles/log4cplus.dir/version.cxx.s
.PHONY : version.cxx.s
# Help Target
@@ -1563,6 +1560,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/src/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/src/cmake_install.cmake
index a5b58608c..cd726ad34 100644
--- a/resources/3rdparty/log4cplus-1.1.0/src/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/src/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,116 +27,117 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
- FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/liblog4cplus.a")
- IF(EXISTS "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/liblog4cplus.a" AND
- NOT IS_SYMLINK "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/liblog4cplus.a")
- EXECUTE_PROCESS(COMMAND "/usr/bin/ranlib" "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib/liblog4cplus.a")
- ENDIF()
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/liblog4cplus.a")
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus" TYPE FILE FILES
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/appender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/asyncappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/clogger.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config.hxx"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/configurator.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/consoleappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/fileappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/fstreams.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/hierarchy.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/hierarchylocker.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/layout.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/log4judpappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/logger.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/loggingmacros.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/loglevel.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/mdc.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/ndc.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/nteventlogappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/nullappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/socketappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/streams.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/syslogappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/tchar.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/tracelogger.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/tstring.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/version.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/win32debugappender.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/win32consoleappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/appender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/asyncappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/clogger.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config.hxx"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/configurator.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/consoleappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/fileappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/fstreams.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/hierarchy.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/hierarchylocker.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/layout.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/log4judpappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/logger.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/loggingmacros.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/loglevel.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/mdc.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/ndc.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/nteventlogappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/nullappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/socketappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/streams.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/syslogappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/tchar.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/tracelogger.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/tstring.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/version.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/win32debugappender.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/win32consoleappender.h"
)
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
- FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/boost" TYPE FILE FILES "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/boost/deviceappender.hxx")
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/boost" TYPE FILE FILES "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/boost/deviceappender.hxx")
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/helpers" TYPE FILE FILES
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/appenderattachableimpl.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/fileinfo.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/lockfile.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/loglog.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/logloguser.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/pointer.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/property.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/queue.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/sleep.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/snprintf.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/socket.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/socketbuffer.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/stringhelper.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/thread-config.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/timehelper.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/appenderattachableimpl.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/fileinfo.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/lockfile.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/loglog.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/logloguser.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/pointer.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/property.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/queue.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/sleep.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/snprintf.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/socket.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/socketbuffer.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/stringhelper.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/thread-config.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/helpers/timehelper.h"
)
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/internal" TYPE FILE FILES
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/internal/env.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/internal/internal.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/internal/socket.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/internal/env.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/internal/internal.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/internal/socket.h"
)
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/spi" TYPE FILE FILES
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/appenderattachable.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/factory.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/filter.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/loggerfactory.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/loggerimpl.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/loggingevent.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/objectregistry.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/rootlogger.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/appenderattachable.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/factory.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/filter.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/loggerfactory.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/loggerimpl.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/loggingevent.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/objectregistry.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/spi/rootlogger.h"
)
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/thread/impl" TYPE FILE FILES
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/syncprims-impl.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/syncprims-pthreads.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/syncprims-win32.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/threads-impl.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/tls.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/syncprims-impl.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/syncprims-pthreads.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/syncprims-win32.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/threads-impl.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/impl/tls.h"
)
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/thread" TYPE FILE FILES
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/syncprims-pub-impl.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/syncprims.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/threads.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/syncprims-pub-impl.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/syncprims.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/thread/threads.h"
)
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
IF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/log4cplus/config" TYPE FILE FILES
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config/macosx.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config/win32.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config/windowsh-inc.h"
- "/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config/defines.hxx"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config/macosx.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config/win32.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/src/../include/log4cplus/config/windowsh-inc.h"
+ "/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/include/log4cplus/config/defines.hxx"
)
ENDIF(NOT CMAKE_INSTALL_COMPONENT OR "${CMAKE_INSTALL_COMPONENT}" STREQUAL "Unspecified")
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/CTestTestfile.cmake
index f8abcaa87..497f3b8ec 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/Makefile
index 3ae85e99c..6b1d18461 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/clean
.PHONY : clean
# The main clean target
@@ -159,17 +156,17 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Help Target
@@ -198,6 +195,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/CTestTestfile.cmake
index 729d163ab..93d67ea22 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/appender_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/appender_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/appender_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/appender_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/Makefile
index 88477e745..1046f1f8c 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/appender_test/CMakeFiles/appender_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/CMakeFiles/appender_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/appender_test/CMakeFiles/appender_test.dir/rule
.PHONY : tests/appender_test/CMakeFiles/appender_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ appender_test: tests/appender_test/CMakeFiles/appender_test.dir/rule
# fast build rule for target.
appender_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/build
.PHONY : appender_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/appender_test/CMakeFiles/appender_test.dir/build.make tests/appender_test/CMakeFiles/appender_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/appender_test b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/appender_test
index 6b9a8b303..3d18c0c10 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/appender_test and b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/appender_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/cmake_install.cmake
index e82e86a39..319e605ac 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/appender_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/appender_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/cmake_install.cmake
index 64c38a999..8932003eb 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,23 +27,28 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
IF(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/cmake_install.cmake")
- INCLUDE("/Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/appender_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/cmake_install.cmake")
+ INCLUDE("/home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/cmake_install.cmake")
ENDIF(NOT CMAKE_INSTALL_LOCAL_ONLY)
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/CTestTestfile.cmake
index 32f87fd8b..92430f17d 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/Makefile
index faeffeead..480f0a078 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/rule
.PHONY : tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ configandwatch_test: tests/configandwatch_test/CMakeFiles/configandwatch_test.di
# fast build rule for target.
configandwatch_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build
.PHONY : configandwatch_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/build.make tests/configandwatch_test/CMakeFiles/configandwatch_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/cmake_install.cmake
index c15e8f122..d8ef7a5f1 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/configandwatch_test b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/configandwatch_test
index d75f3312e..4ee913921 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/configandwatch_test and b/resources/3rdparty/log4cplus-1.1.0/tests/configandwatch_test/configandwatch_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/CTestTestfile.cmake
index f854662d5..97ad1388f 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/Makefile
index 16eb3e061..08d5fa47b 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/rule
.PHONY : tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ customloglevel_test: tests/customloglevel_test/CMakeFiles/customloglevel_test.di
# fast build rule for target.
customloglevel_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build
.PHONY : customloglevel_test/fast
customloglevel.o: customloglevel.cxx.o
@@ -191,7 +188,7 @@ customloglevel.o: customloglevel.cxx.o
# target to build an object file
customloglevel.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/customloglevel.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/customloglevel.cxx.o
.PHONY : customloglevel.cxx.o
customloglevel.i: customloglevel.cxx.i
@@ -199,7 +196,7 @@ customloglevel.i: customloglevel.cxx.i
# target to preprocess a source file
customloglevel.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/customloglevel.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/customloglevel.cxx.i
.PHONY : customloglevel.cxx.i
customloglevel.s: customloglevel.cxx.s
@@ -207,7 +204,7 @@ customloglevel.s: customloglevel.cxx.s
# target to generate assembly for a file
customloglevel.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/customloglevel.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/customloglevel.cxx.s
.PHONY : customloglevel.cxx.s
func.o: func.cxx.o
@@ -215,7 +212,7 @@ func.o: func.cxx.o
# target to build an object file
func.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/func.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/func.cxx.o
.PHONY : func.cxx.o
func.i: func.cxx.i
@@ -223,7 +220,7 @@ func.i: func.cxx.i
# target to preprocess a source file
func.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/func.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/func.cxx.i
.PHONY : func.cxx.i
func.s: func.cxx.s
@@ -231,7 +228,7 @@ func.s: func.cxx.s
# target to generate assembly for a file
func.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/func.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/func.cxx.s
.PHONY : func.cxx.s
main.o: main.cxx.o
@@ -239,7 +236,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -247,7 +244,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -255,7 +252,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/build.make tests/customloglevel_test/CMakeFiles/customloglevel_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -294,6 +291,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/cmake_install.cmake
index 63735fb03..060adb7bf 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/customloglevel_test b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/customloglevel_test
index b2f5b9d0a..64708ba8a 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/customloglevel_test and b/resources/3rdparty/log4cplus-1.1.0/tests/customloglevel_test/customloglevel_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/CTestTestfile.cmake
index 8a4f79a22..617cbca18 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/Makefile
index 69dfc56b2..1a78670f5 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/fileappender_test/CMakeFiles/fileappender_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/CMakeFiles/fileappender_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/fileappender_test/CMakeFiles/fileappender_test.dir/rule
.PHONY : tests/fileappender_test/CMakeFiles/fileappender_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ fileappender_test: tests/fileappender_test/CMakeFiles/fileappender_test.dir/rule
# fast build rule for target.
fileappender_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/build
.PHONY : fileappender_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/fileappender_test/CMakeFiles/fileappender_test.dir/build.make tests/fileappender_test/CMakeFiles/fileappender_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/cmake_install.cmake
index 9285b1b3f..1b703d1e6 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/fileappender_test b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/fileappender_test
index 692a96e65..e6b22f1a3 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/fileappender_test and b/resources/3rdparty/log4cplus-1.1.0/tests/fileappender_test/fileappender_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/CTestTestfile.cmake
index 7da46d141..bcc12ea40 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/filter_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/filter_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/filter_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/filter_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/Makefile
index cb9c14e9e..4feb02a2d 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/filter_test/CMakeFiles/filter_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/CMakeFiles/filter_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/filter_test/CMakeFiles/filter_test.dir/rule
.PHONY : tests/filter_test/CMakeFiles/filter_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ filter_test: tests/filter_test/CMakeFiles/filter_test.dir/rule
# fast build rule for target.
filter_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/build
.PHONY : filter_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/filter_test/CMakeFiles/filter_test.dir/build.make tests/filter_test/CMakeFiles/filter_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/cmake_install.cmake
index c24a171c3..b8656251a 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/filter_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/filter_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/filter_test b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/filter_test
index 1de63c658..9293570b8 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/filter_test and b/resources/3rdparty/log4cplus-1.1.0/tests/filter_test/filter_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/CTestTestfile.cmake
index 178a11122..ca9a43e7c 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/Makefile
index 8c13dfbb8..89d29c59a 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/rule
.PHONY : tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ hierarchy_test: tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/rule
# fast build rule for target.
hierarchy_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build
.PHONY : hierarchy_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/build.make tests/hierarchy_test/CMakeFiles/hierarchy_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/cmake_install.cmake
index 65764bd22..d7d0764d9 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/hierarchy_test b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/hierarchy_test
index ea34b3389..8d1359c53 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/hierarchy_test and b/resources/3rdparty/log4cplus-1.1.0/tests/hierarchy_test/hierarchy_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/CTestTestfile.cmake
index 31b95dcdb..c9a343f64 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/Makefile
index a5a4b49d1..6a81eb002 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/loglog_test/CMakeFiles/loglog_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/CMakeFiles/loglog_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/loglog_test/CMakeFiles/loglog_test.dir/rule
.PHONY : tests/loglog_test/CMakeFiles/loglog_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ loglog_test: tests/loglog_test/CMakeFiles/loglog_test.dir/rule
# fast build rule for target.
loglog_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/build
.PHONY : loglog_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/loglog_test/CMakeFiles/loglog_test.dir/build.make tests/loglog_test/CMakeFiles/loglog_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/cmake_install.cmake
index eb5dac1e7..07fb4b6c2 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/loglog_test b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/loglog_test
index 3c65aeeb6..3a73a8a7f 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/loglog_test and b/resources/3rdparty/log4cplus-1.1.0/tests/loglog_test/loglog_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/CTestTestfile.cmake
index 08e0ae577..8826fc170 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/Makefile
index 1944cb925..123eb8874 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/ndc_test/CMakeFiles/ndc_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/CMakeFiles/ndc_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ndc_test/CMakeFiles/ndc_test.dir/rule
.PHONY : tests/ndc_test/CMakeFiles/ndc_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ ndc_test: tests/ndc_test/CMakeFiles/ndc_test.dir/rule
# fast build rule for target.
ndc_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/build
.PHONY : ndc_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ndc_test/CMakeFiles/ndc_test.dir/build.make tests/ndc_test/CMakeFiles/ndc_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/cmake_install.cmake
index 3b40bdee8..572f72d5b 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/ndc_test b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/ndc_test
index 59d829745..16be36254 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/ndc_test and b/resources/3rdparty/log4cplus-1.1.0/tests/ndc_test/ndc_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/CTestTestfile.cmake
index 512f6fe36..02ea51037 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/Makefile
index fda26509a..9c9b642fd 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/ostream_test/CMakeFiles/ostream_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/CMakeFiles/ostream_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/ostream_test/CMakeFiles/ostream_test.dir/rule
.PHONY : tests/ostream_test/CMakeFiles/ostream_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ ostream_test: tests/ostream_test/CMakeFiles/ostream_test.dir/rule
# fast build rule for target.
ostream_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/build
.PHONY : ostream_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/ostream_test/CMakeFiles/ostream_test.dir/build.make tests/ostream_test/CMakeFiles/ostream_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/cmake_install.cmake
index fd70225de..224bdb664 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/ostream_test b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/ostream_test
index f7255fa34..334709619 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/ostream_test and b/resources/3rdparty/log4cplus-1.1.0/tests/ostream_test/ostream_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/CTestTestfile.cmake
index eff3cc2c7..d29609747 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/Makefile
index faf7fc7e6..6062c2f1d 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/rule
.PHONY : tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ patternlayout_test: tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/r
# fast build rule for target.
patternlayout_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build
.PHONY : patternlayout_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/build.make tests/patternlayout_test/CMakeFiles/patternlayout_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/cmake_install.cmake
index 62cc2c30e..ffdf13360 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/patternlayout_test b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/patternlayout_test
index c5d99efa8..53443b64e 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/patternlayout_test and b/resources/3rdparty/log4cplus-1.1.0/tests/patternlayout_test/patternlayout_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/CTestTestfile.cmake
index f25a478a2..4c555fd9e 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/performance_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/performance_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/performance_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/performance_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/Makefile
index 0bcc25364..1769f2441 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/performance_test/CMakeFiles/performance_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/CMakeFiles/performance_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/performance_test/CMakeFiles/performance_test.dir/rule
.PHONY : tests/performance_test/CMakeFiles/performance_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ performance_test: tests/performance_test/CMakeFiles/performance_test.dir/rule
# fast build rule for target.
performance_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/build
.PHONY : performance_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/performance_test/CMakeFiles/performance_test.dir/build.make tests/performance_test/CMakeFiles/performance_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/cmake_install.cmake
index 13265fe94..03134cecc 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/performance_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/performance_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/performance_test b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/performance_test
index 9469f0c26..896627ac1 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/performance_test and b/resources/3rdparty/log4cplus-1.1.0/tests/performance_test/performance_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/CTestTestfile.cmake
index 60d23013f..350749191 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/priority_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/priority_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/priority_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/priority_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/Makefile
index ae44ced81..82291f6f0 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/priority_test/CMakeFiles/priority_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/CMakeFiles/priority_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/priority_test/CMakeFiles/priority_test.dir/rule
.PHONY : tests/priority_test/CMakeFiles/priority_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ priority_test: tests/priority_test/CMakeFiles/priority_test.dir/rule
# fast build rule for target.
priority_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/build
.PHONY : priority_test/fast
func.o: func.cxx.o
@@ -191,7 +188,7 @@ func.o: func.cxx.o
# target to build an object file
func.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/func.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/func.cxx.o
.PHONY : func.cxx.o
func.i: func.cxx.i
@@ -199,7 +196,7 @@ func.i: func.cxx.i
# target to preprocess a source file
func.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/func.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/func.cxx.i
.PHONY : func.cxx.i
func.s: func.cxx.s
@@ -207,7 +204,7 @@ func.s: func.cxx.s
# target to generate assembly for a file
func.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/func.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/func.cxx.s
.PHONY : func.cxx.s
main.o: main.cxx.o
@@ -215,7 +212,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -223,7 +220,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -231,7 +228,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/priority_test/CMakeFiles/priority_test.dir/build.make tests/priority_test/CMakeFiles/priority_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -267,6 +264,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/cmake_install.cmake
index 0cabec192..6a8bd4ce9 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/priority_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/priority_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/priority_test b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/priority_test
index fa6b2553f..15aafe936 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/priority_test and b/resources/3rdparty/log4cplus-1.1.0/tests/priority_test/priority_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/CTestTestfile.cmake
index d8683a7d2..b5203fd36 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/Makefile
index 247851957..e1b024332 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/rule
.PHONY : tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ propertyconfig_test: tests/propertyconfig_test/CMakeFiles/propertyconfig_test.di
# fast build rule for target.
propertyconfig_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build
.PHONY : propertyconfig_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/build.make tests/propertyconfig_test/CMakeFiles/propertyconfig_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/cmake_install.cmake
index 244905167..121cbbcd2 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/propertyconfig_test b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/propertyconfig_test
index de0cf2f88..e23f30dbe 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/propertyconfig_test and b/resources/3rdparty/log4cplus-1.1.0/tests/propertyconfig_test/propertyconfig_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/CTestTestfile.cmake
index 99ff389ae..7914bf281 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/thread_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/thread_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/thread_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/thread_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/Makefile
index 1f89dc9a1..2c96c4f7c 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/thread_test/CMakeFiles/thread_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/CMakeFiles/thread_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/thread_test/CMakeFiles/thread_test.dir/rule
.PHONY : tests/thread_test/CMakeFiles/thread_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ thread_test: tests/thread_test/CMakeFiles/thread_test.dir/rule
# fast build rule for target.
thread_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/build
.PHONY : thread_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/thread_test/CMakeFiles/thread_test.dir/build.make tests/thread_test/CMakeFiles/thread_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/cmake_install.cmake
index bd0089f61..638357224 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/thread_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/thread_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/thread_test b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/thread_test
index 4640cc16d..f749f2606 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/thread_test and b/resources/3rdparty/log4cplus-1.1.0/tests/thread_test/thread_test differ
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/CTestTestfile.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/CTestTestfile.cmake
index 9776d4ea5..433143166 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/CTestTestfile.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/CTestTestfile.cmake
@@ -1,6 +1,6 @@
# CMake generated Testfile for
-# Source directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test
-# Build directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test
+# Source directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test
+# Build directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test
#
# This file includes the relevent testing commands required for
# testing this directory and lists subdirectories to be tested as well.
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/Makefile b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/Makefile
index 91b1fbee6..b4a0fb196 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/Makefile
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/Makefile
@@ -30,30 +30,27 @@ cmake_force:
SHELL = /bin/sh
# The CMake executable.
-CMAKE_COMMAND = /opt/local/bin/cmake
+CMAKE_COMMAND = /usr/bin/cmake
# The command to remove a file.
-RM = /opt/local/bin/cmake -E remove -f
+RM = /usr/bin/cmake -E remove -f
# Escaping for special characters.
EQUALS = =
-# The program to use to edit the cache.
-CMAKE_EDIT_COMMAND = /opt/local/bin/ccmake
-
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_SOURCE_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0
+CMAKE_BINARY_DIR = /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
- /opt/local/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
+ /usr/bin/cmake -i .
.PHONY : edit_cache
# Special rule for the target edit_cache
@@ -63,19 +60,19 @@ edit_cache/fast: edit_cache
# Special rule for the target install
install: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
- /opt/local/bin/cmake -P cmake_install.cmake
+ /usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
@@ -85,7 +82,7 @@ install/local/fast: install/local
# Special rule for the target install/strip
install/strip: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
- /opt/local/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+ /usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
@@ -104,7 +101,7 @@ list_install_components/fast: list_install_components
# Special rule for the target package
package: preinstall
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackConfig.cmake
.PHONY : package
# Special rule for the target package
@@ -114,7 +111,7 @@ package/fast: package
# Special rule for the target package_source
package_source:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && /opt/local/bin/cpack --config ./CPackSourceConfig.cmake /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && /usr/bin/cpack --config ./CPackSourceConfig.cmake /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CPackSourceConfig.cmake
.PHONY : package_source
# Special rule for the target package_source
@@ -124,7 +121,7 @@ package_source/fast: package_source
# Special rule for the target rebuild_cache
rebuild_cache:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
- /opt/local/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+ /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
# Special rule for the target rebuild_cache
@@ -134,7 +131,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target test
test:
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running tests..."
- /opt/local/bin/ctest --force-new-ctest-process $(ARGS)
+ /usr/bin/ctest --force-new-ctest-process $(ARGS)
.PHONY : test
# Special rule for the target test
@@ -143,14 +140,14 @@ test/fast: test
# The main all target
all: cmake_check_build_system
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/CMakeFiles/progress.marks
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/all
- $(CMAKE_COMMAND) -E cmake_progress_start /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/CMakeFiles/progress.marks
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/clean
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/clean
.PHONY : clean
# The main clean target
@@ -159,22 +156,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/preinstall
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
tests/timeformat_test/CMakeFiles/timeformat_test.dir/rule:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/CMakeFiles/timeformat_test.dir/rule
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f CMakeFiles/Makefile2 tests/timeformat_test/CMakeFiles/timeformat_test.dir/rule
.PHONY : tests/timeformat_test/CMakeFiles/timeformat_test.dir/rule
# Convenience name for target.
@@ -183,7 +180,7 @@ timeformat_test: tests/timeformat_test/CMakeFiles/timeformat_test.dir/rule
# fast build rule for target.
timeformat_test/fast:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/build
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/build
.PHONY : timeformat_test/fast
main.o: main.cxx.o
@@ -191,7 +188,7 @@ main.o: main.cxx.o
# target to build an object file
main.cxx.o:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/main.cxx.o
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/main.cxx.o
.PHONY : main.cxx.o
main.i: main.cxx.i
@@ -199,7 +196,7 @@ main.i: main.cxx.i
# target to preprocess a source file
main.cxx.i:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/main.cxx.i
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/main.cxx.i
.PHONY : main.cxx.i
main.s: main.cxx.s
@@ -207,7 +204,7 @@ main.s: main.cxx.s
# target to generate assembly for a file
main.cxx.s:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/main.cxx.s
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(MAKE) -f tests/timeformat_test/CMakeFiles/timeformat_test.dir/build.make tests/timeformat_test/CMakeFiles/timeformat_test.dir/main.cxx.s
.PHONY : main.cxx.s
# Help Target
@@ -240,6 +237,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0 && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/cmake_install.cmake b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/cmake_install.cmake
index 70d9177ec..5a02d3985 100644
--- a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/cmake_install.cmake
+++ b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /Users/chris/Documents/workspace/mrmc/MRMC/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test
+# Install script for directory: /home/thomas/workspace_mrmc/storm/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test
# Set the install prefix
IF(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -27,3 +27,8 @@ IF(NOT CMAKE_INSTALL_COMPONENT)
ENDIF(COMPONENT)
ENDIF(NOT CMAKE_INSTALL_COMPONENT)
+# Install shared libraries without execute permission?
+IF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+ SET(CMAKE_INSTALL_SO_NO_EXE "1")
+ENDIF(NOT DEFINED CMAKE_INSTALL_SO_NO_EXE)
+
diff --git a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/timeformat_test b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/timeformat_test
index 5d3ac05d8..e0572e4e9 100755
Binary files a/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/timeformat_test and b/resources/3rdparty/log4cplus-1.1.0/tests/timeformat_test/timeformat_test differ
diff --git a/src/adapters/EigenAdapter.h b/src/adapters/EigenAdapter.h
new file mode 100644
index 000000000..d7c8169e0
--- /dev/null
+++ b/src/adapters/EigenAdapter.h
@@ -0,0 +1,57 @@
+/*
+ * EigenAdapter.h
+ *
+ * Created on: 21.01.2013
+ * Author: Philipp Berger
+ */
+
+#ifndef STORM_ADAPTERS_EIGENADAPTER_H_
+#define STORM_ADAPTERS_EIGENADAPTER_H_
+
+#include "src/storage/SparseMatrix.h"
+#include "Eigen/Sparse"
+
+#include "log4cplus/logger.h"
+#include "log4cplus/loggingmacros.h"
+
+extern log4cplus::Logger logger;
+
+namespace storm {
+
+namespace adapters {
+
+class EigenAdapter {
+public:
+ /*!
+ * Converts a sparse matrix into the sparse matrix in the eigen format.
+ * @return A pointer to a row-major sparse matrix in eigen format.
+ */
+ template<class T>
+ static Eigen::SparseMatrix<T, Eigen::RowMajor, int_fast32_t>* toEigenSparseMatrix(storm::storage::SparseMatrix<T> const& matrix) {
+ uint_fast64_t realNonZeros = matrix.getNonZeroEntryCount();
+ LOG4CPLUS_DEBUG(logger, "Converting matrix with " << realNonZeros << " non-zeros to Eigen format.");
+
+ // Prepare the resulting matrix.
+ Eigen::SparseMatrix<T, Eigen::RowMajor, int_fast32_t>* result = new Eigen::SparseMatrix<T, Eigen::RowMajor, int_fast32_t>(matrix.rowCount, matrix.colCount);
+
+ result->resizeNonZeros(realNonZeros);
+ //result->reserve(realNonZeros);
+
+ // Copy Row Indications
+ std::copy(matrix.rowIndications.begin(), matrix.rowIndications.end(), (result->outerIndexPtr()));
+ // Copy Columns Indications
+ std::copy(matrix.columnIndications.begin(), matrix.columnIndications.end(), (result->innerIndexPtr()));
+ // And do the same thing with the actual values.
+ std::copy(matrix.valueStorage.begin(), matrix.valueStorage.end(), (result->valuePtr()));
+
+ LOG4CPLUS_DEBUG(logger, "Done converting matrix to Eigen format.");
+
+ return result;
+ }
+};
+
+} //namespace adapters
+
+} //namespace storm
+
+#endif /* STORM_ADAPTERS_GMMXXADAPTER_H_ */
diff --git a/src/adapters/GmmxxAdapter.h b/src/adapters/GmmxxAdapter.h
index 482b8a16a..5c5faa670 100644
--- a/src/adapters/GmmxxAdapter.h
+++ b/src/adapters/GmmxxAdapter.h
@@ -23,7 +23,7 @@ class GmmxxAdapter {
public:
/*!
* Converts a sparse matrix into the sparse matrix in the gmm++ format.
- * @return A pointer to a column-major sparse matrix in gmm++ format.
+ * @return A pointer to a row-major sparse matrix in gmm++ format.
*/
template<class T>
static gmm::csr_matrix<T>* toGmmxxSparseMatrix(storm::storage::SparseMatrix<T> const& matrix) {
diff --git a/src/exceptions/BaseException.h b/src/exceptions/BaseException.h
index c1b6ee054..6c670f88b 100644
--- a/src/exceptions/BaseException.h
+++ b/src/exceptions/BaseException.h
@@ -28,7 +28,11 @@ class BaseException : public std::exception {
}
virtual const char* what() const throw() {
- return this->stream.str().c_str();
+ std::string errorString = this->stream.str();
+ char* result = new char[errorString.size() + 1];
+ result[errorString.size()] = '\0';
+ std::copy(errorString.begin(), errorString.end(), result);
+ return result;
}
private:
diff --git a/src/exceptions/InvalidAccessException.h b/src/exceptions/InvalidAccessException.h
new file mode 100644
index 000000000..af413b1ed
--- /dev/null
+++ b/src/exceptions/InvalidAccessException.h
@@ -0,0 +1,19 @@
+#ifndef STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_
+#define STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_
+
+#include "src/exceptions/BaseException.h"
+
+namespace storm {
+
+namespace exceptions {
+
+/*!
+ * @brief This exception is thrown when a function is used/accessed that is forbidden to use (e.g. Copy Constructors)
+ */
+STORM_EXCEPTION_DEFINE_NEW(InvalidAccessException)
+
+} // namespace exceptions
+
+} // namespace storm
+
+#endif // STORM_EXCEPTIONS_INVALIDACCESSEXCEPTION_H_
diff --git a/src/formula/AbstractFormula.h b/src/formula/AbstractFormula.h
new file mode 100644
index 000000000..42ba7bc02
--- /dev/null
+++ b/src/formula/AbstractFormula.h
@@ -0,0 +1,73 @@
+/*
+ * Abstractformula.h
+ *
+ * Created on: 19.10.2012
+ * Author: Thomas Heinemann
+ */
+
+#ifndef STORM_FORMULA_ABSTRACTFORMULA_H_
+#define STORM_FORMULA_ABSTRACTFORMULA_H_
+
+#include <string>
+
+namespace storm { namespace formula {
+template <class T> class AbstractFormula;
+}}
+
+#include "src/modelChecker/AbstractModelChecker.h"
+#include "src/formula/AbstractFormulaChecker.h"
+
+namespace storm {
+namespace formula {
+
+
+//abstract
+/*!
+ * @brief Abstract base class for Abstract formulas in general.
+ *
+ * @attention This class is abstract.
+ * @note Formula classes do not have copy constructors. The parameters of the constructors are usually the subtrees, so
+ * the syntax conflicts with copy constructors for unary operators. To produce an identical object, the classes
+ * AbstractPathFormula and AbstractStateFormula offer the method clone().
+ *
+ * This is the base class for every formula class in every logic.
+ */
+template <class T>
+class AbstractFormula {
+
+public:
+ /*!
+ * Virtual destructor.
+ */
+ virtual ~AbstractFormula() { }
+
+ /*!
+ * @brief Return string representation of this formula.
+ *
+ * @note very subclass must implement this method.
+ *
+ * @returns a string representation of the formula
+ */
+ virtual std::string toString() const = 0;
+
+ /*!
+ * @brief Checks if all subtrees are valid in some logic.
+ *
+ * @note Every subclass must implement this method.
+ *
+ * This method is given a checker object that knows which formula
+ * classes are allowed within the logic the checker represents. Every
+ * subclass is supposed to call checker.conforms() for all child
+ * formulas and return true if and only if all those calls returned
+ * true.
+ *
+ * @param checker Checker object.
+ * @return true iff all subtrees are valid.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const = 0;
+};
+
+} // namespace formula
+} // namespace storm
+
+#endif /* STORM_FORMULA_ABSTRACTFORMULA_H_ */
diff --git a/src/formula/AbstractFormulaChecker.h b/src/formula/AbstractFormulaChecker.h
new file mode 100644
index 000000000..6e74c48a4
--- /dev/null
+++ b/src/formula/AbstractFormulaChecker.h
@@ -0,0 +1,56 @@
+#ifndef STORM_FORMULA_ABSTRACTFORMULACHECKER_H_
+#define STORM_FORMULA_ABSTRACTFORMULACHECKER_H_
+
+#include "src/formula/AbstractFormula.h"
+
+namespace storm {
+namespace formula {
+
+/*!
+ * @brief Base class for all formula checkers.
+ *
+ * A formula checker is used to check if a given formula is valid in some
+ * logic. Hence, this pure virtual base class should be subclassed for
+ * every logic we support.
+ *
+ * Every subclass must implement conforms(). It gets a pointer to an
+ * AbstractFormula object and should return if the subtree represented by
+ * this formula is valid in the logic.
+ *
+ * Usually, this will be implemented like this:
+ * @code
+ * if (
+ * dynamic_cast<const And<T>*>(formula) ||
+ * dynamic_cast<const Not<T>*>(formula) ||
+ * dynamic_cast<const Or<T>*>(formula)
+ * ) {
+ * return formula->conforms(*this);
+ * } else return false;
+ * @endcode
+ *
+ * Every formula class implements a conforms() method itself which calls
+ * conforms() on the given checker for every child in the formula tree.
+ *
+ * If the formula structure is not an actual tree, but an directed acyclic
+ * graph, the shared subtrees will be checked twice. If we have directed
+ * cycles, we will have infinite recursions.
+ */
+template <class T>
+class AbstractFormulaChecker {
+ public:
+ /*!
+ * @brief Checks if the given formula is valid in some logic.
+ *
+ * Every subclass must implement this method and check, if the
+ * formula object is valid in the logic of the subclass.
+ *
+ * @param formula A pointer to some formula object.
+ * @return true iff the formula is valid.
+ */
+ virtual bool conforms(const AbstractFormula<T>* formula) const = 0;
+};
+
+} // namespace formula
+} // namespace storm
+
+#endif
\ No newline at end of file
diff --git a/src/formula/PctlPathFormula.h b/src/formula/AbstractPathFormula.h
similarity index 64%
rename from src/formula/PctlPathFormula.h
rename to src/formula/AbstractPathFormula.h
index 01889b56e..4337cbe19 100644
--- a/src/formula/PctlPathFormula.h
+++ b/src/formula/AbstractPathFormula.h
@@ -1,25 +1,30 @@
/*
- * PctlPathFormula.h
+ * AbstractPathFormula.h
*
* Created on: 19.10.2012
* Author: Thomas Heinemann
*/
-#ifndef STORM_FORMULA_PCTLPATHFORMULA_H_
-#define STORM_FORMULA_PCTLPATHFORMULA_H_
+#ifndef STORM_FORMULA_ABSTRACTPATHFORMULA_H_
+#define STORM_FORMULA_ABSTRACTPATHFORMULA_H_
-#include "modelChecker/ForwardDeclarations.h"
-#include "PctlFormula.h"
+namespace storm { namespace formula {
+template <class T> class AbstractPathFormula;
+}}
+#include "src/formula/AbstractFormula.h"
+
+#include "modelChecker/AbstractModelChecker.h"
#include <vector>
+#include <iostream>
+#include <typeinfo>
namespace storm {
-
namespace formula {
/*!
* @brief
- * Abstract base class for PCTL path formulas.
+ * Abstract base class for Abstract path formulas.
*
* @attention This class is abstract.
* @note Formula classes do not have copy constructors. The parameters of the constructors are usually the subtrees, so
@@ -27,13 +32,13 @@ namespace formula {
* clone().
*/
template <class T>
-class PctlPathFormula : public PctlFormula<T> {
+class AbstractPathFormula : public virtual AbstractFormula<T> {
public:
/*!
* empty destructor
*/
- virtual ~PctlPathFormula() { }
+ virtual ~AbstractPathFormula() { }
/*!
* Clones the called object.
@@ -43,7 +48,7 @@ public:
* @note This function is not implemented in this class.
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const = 0;
+ virtual AbstractPathFormula<T>* clone() const = 0;
/*!
* Calls the model checker to check this formula.
@@ -56,13 +61,10 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T>* check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const = 0;
+ virtual std::vector<T>* check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const = 0;
};
} //namespace formula
-
} //namespace storm
-
-
-#endif /* STORM_FORMULA_PCTLPATHFORMULA_H_ */
+#endif /* STORM_FORMULA_ABSTRACTPATHFORMULA_H_ */
diff --git a/src/formula/PctlStateFormula.h b/src/formula/AbstractStateFormula.h
similarity index 67%
rename from src/formula/PctlStateFormula.h
rename to src/formula/AbstractStateFormula.h
index b27b0087e..9309bf610 100644
--- a/src/formula/PctlStateFormula.h
+++ b/src/formula/AbstractStateFormula.h
@@ -1,24 +1,27 @@
/*
- * PctlStateFormula.h
+ * AbstractStateFormula.h
*
* Created on: 19.10.2012
* Author: Thomas Heinemann
*/
-#ifndef STORM_FORMULA_PCTLSTATEFORMULA_H_
-#define STORM_FORMULA_PCTLSTATEFORMULA_H_
+#ifndef STORM_FORMULA_ABSTRACTSTATEFORMULA_H_
+#define STORM_FORMULA_ABSTRACTSTATEFORMULA_H_
-#include "modelChecker/ForwardDeclarations.h"
-#include "PctlFormula.h"
-#include "storage/BitVector.h"
+namespace storm { namespace formula {
+template <class T> class AbstractStateFormula;
+}}
-namespace storm {
+#include "AbstractFormula.h"
+#include "src/storage/BitVector.h"
+#include "src/modelChecker/AbstractModelChecker.h"
+namespace storm {
namespace formula {
/*!
* @brief
- * Abstract base class for PCTL state formulas.
+ * Abstract base class for Abstract state formulas.
*
* @attention This class is abstract.
* @note Formula classes do not have copy constructors. The parameters of the constructors are usually the subtrees, so
@@ -26,13 +29,13 @@ namespace formula {
* clone().
*/
template <class T>
-class PctlStateFormula : public PctlFormula<T> {
+class AbstractStateFormula : public AbstractFormula<T> {
public:
/*!
* empty destructor
*/
- virtual ~PctlStateFormula() { }
+ virtual ~AbstractStateFormula() { }
/*!
* Clones the called object.
@@ -42,7 +45,7 @@ public:
* @note This function is not implemented in this class.
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const = 0;
+ virtual AbstractStateFormula<T>* clone() const = 0;
/*!
* Calls the model checker to check this formula.
@@ -55,11 +58,11 @@ public:
*
* @returns A bit vector indicating all states that satisfy the formula represented by the called object.
*/
- virtual storm::storage::BitVector *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const = 0;
+ virtual storm::storage::BitVector *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const = 0; // {
};
} //namespace formula
-
} //namespace storm
-#endif /* STORM_FORMULA_PCTLSTATEFORMULA_H_ */
+
+#endif /* STORM_FORMULA_AbstractSTATEFORMULA_H_ */
diff --git a/src/formula/And.h b/src/formula/And.h
index d166fd7c5..d8078cd15 100644
--- a/src/formula/And.h
+++ b/src/formula/And.h
@@ -8,18 +8,39 @@
#ifndef STORM_FORMULA_AND_H_
#define STORM_FORMULA_AND_H_
-#include "PctlStateFormula.h"
+#include "src/formula/AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelChecker/AbstractModelChecker.h"
#include <string>
namespace storm {
-
namespace formula {
+template <class T> class And;
+
+/*!
+ * @brief Interface class for model checkers that support And.
+ *
+ * All model checkers that support the formula class And must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IAndModelChecker {
+ public:
+ /*!
+ * @brief Evaluates And formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual storm::storage::BitVector* checkAnd(const And<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL formula tree with AND node as root.
+ * Class for a Abstract formula tree with AND node as root.
*
- * Has two PCTL state formulas as sub formulas/trees.
+ * Has two Abstract state formulas as sub formulas/trees.
*
* As AND is commutative, the order is \e theoretically not important, but will influence the order in which
* the model checker works.
@@ -27,11 +48,11 @@ namespace formula {
* The subtrees are seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlStateFormula
- * @see PctlFormula
+ * @see AbstractStateFormula
+ * @see AbstractFormula
*/
template <class T>
-class And : public PctlStateFormula<T> {
+class And : public AbstractStateFormula<T> {
public:
/*!
@@ -50,7 +71,7 @@ public:
* @param left The left sub formula
* @param right The right sub formula
*/
- And(PctlStateFormula<T>* left, PctlStateFormula<T>* right) {
+ And(AbstractStateFormula<T>* left, AbstractStateFormula<T>* right) {
this->left = left;
this->right = right;
}
@@ -75,7 +96,7 @@ public:
*
* @param newLeft the new left child.
*/
- void setLeft(PctlStateFormula<T>* newLeft) {
+ void setLeft(AbstractStateFormula<T>* newLeft) {
left = newLeft;
}
@@ -84,21 +105,21 @@ public:
*
* @param newRight the new right child.
*/
- void setRight(PctlStateFormula<T>* newRight) {
+ void setRight(AbstractStateFormula<T>* newRight) {
right = newRight;
}
/*!
* @returns a pointer to the left child node
*/
- const PctlStateFormula<T>& getLeft() const {
+ const AbstractStateFormula<T>& getLeft() const {
return *left;
}
/*!
* @returns a pointer to the right child node
*/
- const PctlStateFormula<T>& getRight() const {
+ const AbstractStateFormula<T>& getRight() const {
return *right;
}
@@ -121,7 +142,7 @@ public:
*
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const {
+ virtual AbstractStateFormula<T>* clone() const {
And<T>* result = new And();
if (this->left != NULL) {
result->setLeft(left->clone());
@@ -141,13 +162,23 @@ public:
*
* @returns A bit vector indicating all states that satisfy the formula represented by the called object.
*/
- virtual storm::storage::BitVector *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkAnd(*this);
+ virtual storm::storage::BitVector* check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IAndModelChecker>()->checkAnd(*this);
}
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff all subtrees conform to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->left) && checker.conforms(this->right);
+ }
private:
- PctlStateFormula<T>* left;
- PctlStateFormula<T>* right;
+ AbstractStateFormula<T>* left;
+ AbstractStateFormula<T>* right;
};
} //namespace formula
diff --git a/src/formula/Ap.h b/src/formula/Ap.h
index e479d0c61..ba5c13287 100644
--- a/src/formula/Ap.h
+++ b/src/formula/Ap.h
@@ -8,23 +8,44 @@
#ifndef STORM_FORMULA_AP_H_
#define STORM_FORMULA_AP_H_
-#include "PctlStateFormula.h"
+#include "src/formula/AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelChecker/AbstractModelChecker.h"
namespace storm {
-
namespace formula {
+template <class T> class Ap;
+
+/*!
+ * @brief Interface class for model checkers that support Ap.
+ *
+ * All model checkers that support the formula class Ap must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IApModelChecker {
+ public:
+ /*!
+ * @brief Evaluates Ap formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual storm::storage::BitVector* checkAp(const Ap<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL formula tree with atomic proposition as root.
+ * Class for a Abstract formula tree with atomic proposition as root.
*
* This class represents the leaves in the formula tree.
*
- * @see PctlStateFormula
- * @see PctlFormula
+ * @see AbstractStateFormula
+ * @see AbstractFormula
*/
template <class T>
-class Ap : public PctlStateFormula<T> {
+class Ap : public AbstractStateFormula<T> {
public:
/*!
@@ -64,7 +85,7 @@ public:
*
* @returns a new Ap-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const {
+ virtual AbstractStateFormula<T>* clone() const {
return new Ap(ap);
}
@@ -77,8 +98,20 @@ public:
*
* @returns A bit vector indicating all states that satisfy the formula represented by the called object.
*/
- virtual storm::storage::BitVector *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkAp(*this);
+ virtual storm::storage::BitVector *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IApModelChecker>()->checkAp(*this);
+ }
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * As atomic propositions have no subformulas, we return true here.
+ *
+ * @param checker Formula checker object.
+ * @return true
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return true;
}
private:
diff --git a/src/formula/BoundOperator.h b/src/formula/BoundOperator.h
index ec5873160..512d48d2a 100644
--- a/src/formula/BoundOperator.h
+++ b/src/formula/BoundOperator.h
@@ -8,20 +8,36 @@
#ifndef STORM_FORMULA_BOUNDOPERATOR_H_
#define STORM_FORMULA_BOUNDOPERATOR_H_
-#include "PctlStateFormula.h"
-#include "PctlPathFormula.h"
-#include "utility/ConstTemplates.h"
+#include "src/formula/AbstractStateFormula.h"
+#include "src/formula/AbstractPathFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelChecker/AbstractModelChecker.h"
+#include "src/utility/ConstTemplates.h"
namespace storm {
namespace formula {
+template <class T> class BoundOperator;
+
+/*!
+ * @brief Interface class for model checkers that support BoundOperator.
+ *
+ * All model checkers that support the formula class BoundOperator must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IBoundOperatorModelChecker {
+ public:
+ virtual storm::storage::BitVector* checkBoundOperator(const BoundOperator<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL formula tree with a P (probablistic) operator node over a probability interval
+ * Class for a Abstract formula tree with a P (probablistic) operator node over a probability interval
* as root.
*
- * Has one PCTL path formula as sub formula/tree.
+ * Has one Abstract path formula as sub formula/tree.
*
* @par Semantics
* The formula holds iff the probability that the path formula holds is inside the bounds
@@ -31,14 +47,14 @@ namespace formula {
* (this behavior can be prevented by setting them to NULL before deletion)
*
*
- * @see PctlStateFormula
- * @see PctlPathFormula
+ * @see AbstractStateFormula
+ * @see AbstractPathFormula
* @see ProbabilisticOperator
* @see ProbabilisticNoBoundsOperator
- * @see PctlFormula
+ * @see AbstractFormula
*/
template<class T>
-class BoundOperator : public PctlStateFormula<T> {
+class BoundOperator : public AbstractStateFormula<T> {
public:
enum ComparisonType { LESS, LESS_EQUAL, GREATER, GREATER_EQUAL };
@@ -50,7 +66,7 @@ public:
* @param bound The bound for the probability
* @param pathFormula The child node
*/
- BoundOperator(ComparisonType comparisonOperator, T bound, PctlPathFormula<T>* pathFormula)
+ BoundOperator(ComparisonType comparisonOperator, T bound, AbstractPathFormula<T>* pathFormula)
: comparisonOperator(comparisonOperator), bound(bound), pathFormula(pathFormula) {
// Intentionally left empty
}
@@ -68,9 +84,9 @@ public:
}
/*!
- * @returns the child node (representation of a PCTL path formula)
+ * @returns the child node (representation of a Abstract path formula)
*/
- const PctlPathFormula<T>& getPathFormula () const {
+ const AbstractPathFormula<T>& getPathFormula () const {
return *pathFormula;
}
@@ -79,7 +95,7 @@ public:
*
* @param pathFormula the path formula that becomes the new child node
*/
- void setPathFormula(PctlPathFormula<T>* pathFormula) {
+ void setPathFormula(AbstractPathFormula<T>* pathFormula) {
this->pathFormula = pathFormula;
}
@@ -145,7 +161,7 @@ public:
*
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const = 0;
+ virtual AbstractStateFormula<T>* clone() const = 0;
/*!
* Calls the model checker to check this formula.
@@ -156,14 +172,24 @@ public:
*
* @returns A bit vector indicating all states that satisfy the formula represented by the called object.
*/
- virtual storm::storage::BitVector *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkBoundOperator(*this);
+ virtual storm::storage::BitVector *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IBoundOperatorModelChecker>()->checkBoundOperator(*this);
}
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->pathFormula);
+ }
private:
ComparisonType comparisonOperator;
T bound;
- PctlPathFormula<T>* pathFormula;
+ AbstractPathFormula<T>* pathFormula;
};
} //namespace formula
diff --git a/src/formula/BoundedEventually.h b/src/formula/BoundedEventually.h
index 0a66f6b83..4be075840 100644
--- a/src/formula/BoundedEventually.h
+++ b/src/formula/BoundedEventually.h
@@ -8,20 +8,42 @@
#ifndef STORM_FORMULA_BOUNDEDEVENTUALLY_H_
#define STORM_FORMULA_BOUNDEDEVENTUALLY_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
#include "boost/integer/integer_mask.hpp"
#include <string>
+#include "src/modelChecker/AbstractModelChecker.h"
namespace storm {
namespace formula {
+template <class T> class BoundedEventually;
+
+/*!
+ * @brief Interface class for model checkers that support BoundedEventually.
+ *
+ * All model checkers that support the formula class BoundedEventually must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IBoundedEventuallyModelChecker {
+ public:
+ /*!
+ * @brief Evaluates BoundedEventually formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkBoundedEventually(const BoundedEventually<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with a BoundedEventually node as root.
+ * Class for a Abstract (path) formula tree with a BoundedEventually node as root.
*
- * Has one PCTL state formulas as sub formula/tree.
+ * Has one Abstract state formulas as sub formula/tree.
*
* @par Semantics
* The formula holds iff in at most \e bound steps, formula \e child holds.
@@ -29,11 +51,11 @@ namespace formula {
* The subtrees are seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class BoundedEventually : public PctlPathFormula<T> {
+class BoundedEventually : public AbstractPathFormula<T> {
public:
/*!
@@ -50,7 +72,7 @@ public:
* @param child The child formula subtree
* @param bound The maximal number of steps
*/
- BoundedEventually(PctlStateFormula<T>* child, uint_fast64_t bound) {
+ BoundedEventually(AbstractStateFormula<T>* child, uint_fast64_t bound) {
this->child = child;
this->bound = bound;
}
@@ -70,7 +92,7 @@ public:
/*!
* @returns the child node
*/
- const PctlStateFormula<T>& getChild() const {
+ const AbstractStateFormula<T>& getChild() const {
return *child;
}
@@ -78,7 +100,7 @@ public:
* Sets the subtree
* @param child the new child node
*/
- void setChild(PctlStateFormula<T>* child) {
+ void setChild(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -116,7 +138,7 @@ public:
*
* @returns a new BoundedUntil-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
BoundedEventually<T>* result = new BoundedEventually<T>();
result->setBound(bound);
if (child != nullptr) {
@@ -135,12 +157,22 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkBoundedEventually(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IBoundedEventuallyModelChecker>()->checkBoundedEventually(*this);
+ }
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->child);
}
private:
- PctlStateFormula<T>* child;
+ AbstractStateFormula<T>* child;
uint_fast64_t bound;
};
diff --git a/src/formula/BoundedNaryUntil.h b/src/formula/BoundedNaryUntil.h
new file mode 100644
index 000000000..c42dab12b
--- /dev/null
+++ b/src/formula/BoundedNaryUntil.h
@@ -0,0 +1,211 @@
+/*
+ * BoundedNaryUntil.h
+ *
+ * Created on: 19.10.2012
+ * Author: Thomas Heinemann
+ */
+
+#ifndef STORM_FORMULA_BOUNDEDNARYUNTIL_H_
+#define STORM_FORMULA_BOUNDEDNARYUNTIL_H_
+
+#include "src/formula/AbstractPathFormula.h"
+#include "src/formula/AbstractStateFormula.h"
+#include "src/modelChecker/AbstractModelChecker.h"
+#include "boost/integer/integer_mask.hpp"
+#include <string>
+#include <vector>
+#include <tuple>
+#include <sstream>
+#include "src/formula/AbstractFormulaChecker.h"
+
+namespace storm {
+namespace formula {
+
+template <class T> class BoundedNaryUntil;
+
+/*!
+ * @brief Interface class for model checkers that support BoundedNaryUntil.
+ *
+ * All model checkers that support the formula class BoundedNaryUntil must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IBoundedNaryUntilModelChecker {
+ public:
+ /*!
+ * @brief Evaluates BoundedNaryUntil formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkBoundedNaryUntil(const BoundedNaryUntil<T>& obj) const = 0;
+};
+
+/*!
+ * @brief
+ * Class for a Abstract (path) formula tree with a BoundedNaryUntil node as root.
+ *
+ * Has at least two Abstract state formulas as sub formulas and an interval
+ * associated with all but the first sub formula. We'll call the first one
+ * \e left and all other one \e right.
+ *
+ * @par Semantics
+ * The formula holds iff \e left holds until eventually any of the \e right
+ * formulas holds after a number of steps contained in the interval
+ * associated with this formula.
+ *
+ * The subtrees are seen as part of the object and deleted with the object
+ * (this behavior can be prevented by setting them to NULL before deletion)
+ *
+ * @see AbstractPathFormula
+ * @see AbstractFormula
+ */
+template <class T>
+class BoundedNaryUntil : public AbstractPathFormula<T> {
+
+public:
+ /*!
+ * Empty constructor
+ */
+ BoundedNaryUntil() {
+ this->left = NULL;
+ this->right = new std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>();
+ }
+
+ /*!
+ * Constructor
+ *
+ * @param left The left formula subtree
+ * @param right The left formula subtree
+ * @param bound The maximal number of steps
+ */
+ BoundedNaryUntil(AbstractStateFormula<T>* left, std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* right) {
+ this->left = left;
+ this->right = right;
+ }
+
+ /*!
+ * Destructor.
+ *
+ * Also deletes the subtrees.
+ * (this behaviour can be prevented by setting the subtrees to NULL before deletion)
+ */
+ virtual ~BoundedNaryUntil() {
+ if (left != NULL) {
+ delete left;
+ }
+ if (right != NULL) {
+ delete right;
+ }
+ }
+
+ /*!
+ * Sets the left child node.
+ *
+ * @param newLeft the new left child.
+ */
+ void setLeft(AbstractStateFormula<T>* newLeft) {
+ left = newLeft;
+ }
+
+ void setRight(std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* newRight) {
+ right = newRight;
+ }
+
+
+ /*!
+ * Sets the right child node.
+ *
+ * @param newRight the new right child.
+ */
+ void addRight(AbstractStateFormula<T>* newRight, T upperBound, T lowerBound) {
+ this->right->push_back(std::tuple<AbstractStateFormula<T>*,T,T>(newRight, upperBound, lowerBound));
+ }
+
+ /*!
+ * @returns a pointer to the left child node
+ */
+ const AbstractStateFormula<T>& getLeft() const {
+ return *left;
+ }
+
+ /*!
+ * @returns a pointer to the right child nodes.
+ */
+ const std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>& getRight() const {
+ return *right;
+ }
+
+ /*!
+ * @returns a string representation of the formula
+ */
+ virtual std::string toString() const {
+ std::stringstream result;
+ result << "( " << left->toString();
+ for (auto it = this->right->begin(); it != this->right->end(); ++it) {
+ result << " U[" << std::get<1>(*it) << "," << std::get<2>(*it) << "] " << std::get<0>(*it)->toString();
+ }
+ result << ")";
+ return result.str();
+ }
+
+ /*!
+ * Clones the called object.
+ *
+ * Performs a "deep copy", i.e. the subtrees of the new object are clones of the original ones
+ *
+ * @returns a new BoundedNaryUntil-object that is identical the called object.
+ */
+ virtual AbstractPathFormula<T>* clone() const {
+ BoundedNaryUntil<T>* result = new BoundedNaryUntil<T>();
+ if (left != NULL) {
+ result->setLeft(left->clone());
+ }
+ if (right != NULL) {
+ std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* newright = new std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>();
+ for (auto it = this->right->begin(); it != this->right->end(); ++it) {
+ newright->push_back(std::tuple<AbstractStateFormula<T>*,T,T>(std::get<0>(*it)->clone(), std::get<1>(*it), std::get<2>(*it)));
+ }
+ result->setRight(newright);
+ }
+ return result;
+ }
+
+
+ /*!
+ * Calls the model checker to check this formula.
+ * Needed to infer the correct type of formula class.
+ *
+ * @note This function should only be called in a generic check function of a model checker class. For other uses,
+ * the methods of the model checker should be used.
+ *
+ * @returns A vector indicating the probability that the formula holds for each state.
+ */
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IBoundedNaryUntilModelChecker>()->checkBoundedNaryUntil(*this);
+ }
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff all subtrees conform to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ bool res = checker.conforms(this->left);
+ for (auto it = this->right->begin(); it != this->right->end(); ++it) {
+ res &= checker.conforms(std::get<0>(*it));
+ }
+ return res;
+ }
+
+private:
+ AbstractStateFormula<T>* left;
+ std::vector<std::tuple<AbstractStateFormula<T>*,T,T>>* right;
+};
+
+} //namespace formula
+
+} //namespace storm
+
+#endif /* STORM_FORMULA_BOUNDEDNARYUNTIL_H_ */
diff --git a/src/formula/BoundedUntil.h b/src/formula/BoundedUntil.h
index 675138e27..e00acac74 100644
--- a/src/formula/BoundedUntil.h
+++ b/src/formula/BoundedUntil.h
@@ -8,20 +8,41 @@
#ifndef STORM_FORMULA_BOUNDEDUNTIL_H_
#define STORM_FORMULA_BOUNDEDUNTIL_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "src/formula/AbstractPathFormula.h"
+#include "src/formula/AbstractStateFormula.h"
+#include "src/modelChecker/AbstractModelChecker.h"
#include "boost/integer/integer_mask.hpp"
#include <string>
+#include "src/formula/AbstractFormulaChecker.h"
namespace storm {
-
namespace formula {
+template <class T> class BoundedUntil;
+
+/*!
+ * @brief Interface class for model checkers that support BoundedUntil.
+ *
+ * All model checkers that support the formula class BoundedUntil must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IBoundedUntilModelChecker {
+ public:
+ /*!
+ * @brief Evaluates BoundedUntil formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkBoundedUntil(const BoundedUntil<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with a BoundedUntil node as root.
+ * Class for a Abstract (path) formula tree with a BoundedUntil node as root.
*
- * Has two PCTL state formulas as sub formulas/trees.
+ * Has two Abstract state formulas as sub formulas/trees.
*
* @par Semantics
* The formula holds iff in at most \e bound steps, formula \e right (the right subtree) holds, and before,
@@ -30,11 +51,11 @@ namespace formula {
* The subtrees are seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class BoundedUntil : public PctlPathFormula<T> {
+class BoundedUntil : public AbstractPathFormula<T> {
public:
/*!
@@ -53,7 +74,7 @@ public:
* @param right The left formula subtree
* @param bound The maximal number of steps
*/
- BoundedUntil(PctlStateFormula<T>* left, PctlStateFormula<T>* right,
+ BoundedUntil(AbstractStateFormula<T>* left, AbstractStateFormula<T>* right,
uint_fast64_t bound) {
this->left = left;
this->right = right;
@@ -80,7 +101,7 @@ public:
*
* @param newLeft the new left child.
*/
- void setLeft(PctlStateFormula<T>* newLeft) {
+ void setLeft(AbstractStateFormula<T>* newLeft) {
left = newLeft;
}
@@ -89,21 +110,21 @@ public:
*
* @param newRight the new right child.
*/
- void setRight(PctlStateFormula<T>* newRight) {
+ void setRight(AbstractStateFormula<T>* newRight) {
right = newRight;
}
/*!
* @returns a pointer to the left child node
*/
- const PctlStateFormula<T>& getLeft() const {
+ const AbstractStateFormula<T>& getLeft() const {
return *left;
}
/*!
* @returns a pointer to the right child node
*/
- const PctlStateFormula<T>& getRight() const {
+ const AbstractStateFormula<T>& getRight() const {
return *right;
}
@@ -144,7 +165,7 @@ public:
*
* @returns a new BoundedUntil-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
BoundedUntil<T>* result = new BoundedUntil<T>();
result->setBound(bound);
if (left != NULL) {
@@ -166,13 +187,23 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkBoundedUntil(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IBoundedUntilModelChecker>()->checkBoundedUntil(*this);
+ }
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff all subtrees conform to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->left) && checker.conforms(this->right);
}
private:
- PctlStateFormula<T>* left;
- PctlStateFormula<T>* right;
+ AbstractStateFormula<T>* left;
+ AbstractStateFormula<T>* right;
uint_fast64_t bound;
};
diff --git a/src/formula/CumulativeReward.h b/src/formula/CumulativeReward.h
index cbbf1e18b..e89bcfbaf 100644
--- a/src/formula/CumulativeReward.h
+++ b/src/formula/CumulativeReward.h
@@ -8,8 +8,9 @@
#ifndef STORM_FORMULA_CUMULATIVEREWARD_H_
#define STORM_FORMULA_CUMULATIVEREWARD_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
#include "boost/integer/integer_mask.hpp"
#include <string>
@@ -17,18 +18,38 @@ namespace storm {
namespace formula {
+template <class T> class CumulativeReward;
+
+/*!
+ * @brief Interface class for model checkers that support CumulativeReward.
+ *
+ * All model checkers that support the formula class CumulativeReward must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class ICumulativeRewardModelChecker {
+ public:
+ /*!
+ * @brief Evaluates CumulativeReward formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkCumulativeReward(const CumulativeReward<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with a Cumulative Reward node as root.
+ * Class for a Abstract (path) formula tree with a Cumulative Reward node as root.
*
* The subtrees are seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class CumulativeReward : public PctlPathFormula<T> {
+class CumulativeReward : public AbstractPathFormula<T> {
public:
/*!
@@ -84,9 +105,9 @@ public:
*
* Performs a "deep copy", i.e. the subtrees of the new object are clones of the original ones
*
- * @returns a new BoundedUntil-object that is identical the called object.
+ * @returns a new CumulativeReward-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
return new CumulativeReward(bound);
}
@@ -100,8 +121,20 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkCumulativeReward(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<ICumulativeRewardModelChecker>()->checkCumulativeReward(*this);
+ }
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * As CumulativeReward objects have no subformulas, we return true here.
+ *
+ * @param checker Formula checker object.
+ * @return true
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return true;
}
private:
diff --git a/src/formula/Eventually.h b/src/formula/Eventually.h
index 1a781fbb7..4b2ca1ba3 100644
--- a/src/formula/Eventually.h
+++ b/src/formula/Eventually.h
@@ -8,18 +8,39 @@
#ifndef STORM_FORMULA_EVENTUALLY_H_
#define STORM_FORMULA_EVENTUALLY_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/modelChecker/AbstractModelChecker.h"
namespace storm {
namespace formula {
+template <class T> class Eventually;
+
+/*!
+ * @brief Interface class for model checkers that support Eventually.
+ *
+ * All model checkers that support the formula class Eventually must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IEventuallyModelChecker {
+ public:
+ /*!
+ * @brief Evaluates Eventually formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkEventually(const Eventually<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with an Eventually node as root.
+ * Class for a Abstract (path) formula tree with an Eventually node as root.
*
- * Has one PCTL state formula as sub formula/tree.
+ * Has one Abstract state formula as sub formula/tree.
*
* @par Semantics
* The formula holds iff eventually \e child holds.
@@ -27,11 +48,11 @@ namespace formula {
* The subtree is seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to nullptr before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class Eventually : public PctlPathFormula<T> {
+class Eventually : public AbstractPathFormula<T> {
public:
/*!
@@ -46,7 +67,7 @@ public:
*
* @param child The child node
*/
- Eventually(PctlStateFormula<T>* child) {
+ Eventually(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -65,7 +86,7 @@ public:
/*!
* @returns the child node
*/
- const PctlStateFormula<T>& getChild() const {
+ const AbstractStateFormula<T>& getChild() const {
return *child;
}
@@ -73,7 +94,7 @@ public:
* Sets the subtree
* @param child the new child node
*/
- void setChild(PctlStateFormula<T>* child) {
+ void setChild(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -91,9 +112,9 @@ public:
*
* Performs a "deep copy", i.e. the subtrees of the new object are clones of the original ones
*
- * @returns a new BoundedUntil-object that is identical the called object.
+ * @returns a new Eventually-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
Eventually<T>* result = new Eventually<T>();
if (child != nullptr) {
result->setChild(child);
@@ -110,12 +131,22 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkEventually(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IEventuallyModelChecker>()->checkEventually(*this);
+ }
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->child);
}
private:
- PctlStateFormula<T>* child;
+ AbstractStateFormula<T>* child;
};
} //namespace formula
diff --git a/src/formula/Formulas.h b/src/formula/Formulas.h
index 38c607771..9af1fed84 100644
--- a/src/formula/Formulas.h
+++ b/src/formula/Formulas.h
@@ -10,15 +10,18 @@
#include "modelChecker/ForwardDeclarations.h"
+#include "AbstractFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+
+
#include "And.h"
#include "Ap.h"
#include "BoundedUntil.h"
+#include "BoundedNaryUntil.h"
#include "Next.h"
#include "Not.h"
#include "Or.h"
-#include "PctlFormula.h"
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
#include "ProbabilisticNoBoundOperator.h"
#include "ProbabilisticBoundOperator.h"
#include "Until.h"
diff --git a/src/formula/Globally.h b/src/formula/Globally.h
index 02a18b884..e42837091 100644
--- a/src/formula/Globally.h
+++ b/src/formula/Globally.h
@@ -8,18 +8,39 @@
#ifndef STORM_FORMULA_GLOBALLY_H_
#define STORM_FORMULA_GLOBALLY_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
namespace storm {
namespace formula {
+template <class T> class Globally;
+
+/*!
+ * @brief Interface class for model checkers that support Globally.
+ *
+ * All model checkers that support the formula class Globally must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IGloballyModelChecker {
+ public:
+ /*!
+ * @brief Evaluates Globally formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkGlobally(const Globally<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with a Globally node as root.
+ * Class for a Abstract (path) formula tree with a Globally node as root.
*
- * Has one PCTL state formula as sub formula/tree.
+ * Has one Abstract state formula as sub formula/tree.
*
* @par Semantics
* The formula holds iff globally \e child holds.
@@ -27,11 +48,11 @@ namespace formula {
* The subtree is seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to nullptr before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class Globally : public PctlPathFormula<T> {
+class Globally : public AbstractPathFormula<T> {
public:
/*!
@@ -46,7 +67,7 @@ public:
*
* @param child The child node
*/
- Globally(PctlStateFormula<T>* child) {
+ Globally(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -65,7 +86,7 @@ public:
/*!
* @returns the child node
*/
- const PctlStateFormula<T>& getChild() const {
+ const AbstractStateFormula<T>& getChild() const {
return *child;
}
@@ -73,7 +94,7 @@ public:
* Sets the subtree
* @param child the new child node
*/
- void setChild(PctlStateFormula<T>* child) {
+ void setChild(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -91,9 +112,9 @@ public:
*
* Performs a "deep copy", i.e. the subtrees of the new object are clones of the original ones
*
- * @returns a new BoundedUntil-object that is identical the called object.
+ * @returns a new Globally-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
Next<T>* result = new Next<T>();
if (child != nullptr) {
result->setChild(child);
@@ -110,12 +131,22 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkGlobally(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IGloballyModelChecker>()->checkGlobally(*this);
+ }
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->child);
}
private:
- PctlStateFormula<T>* child;
+ AbstractStateFormula<T>* child;
};
} //namespace formula
diff --git a/src/formula/InstantaneousReward.h b/src/formula/InstantaneousReward.h
index d6067d344..8f55b2c7c 100644
--- a/src/formula/InstantaneousReward.h
+++ b/src/formula/InstantaneousReward.h
@@ -8,8 +8,9 @@
#ifndef STORM_FORMULA_INSTANTANEOUSREWARD_H_
#define STORM_FORMULA_INSTANTANEOUSREWARD_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
#include "boost/integer/integer_mask.hpp"
#include <string>
@@ -17,18 +18,38 @@ namespace storm {
namespace formula {
+template <class T> class InstantaneousReward;
+
+/*!
+ * @brief Interface class for model checkers that support InstantaneousReward.
+ *
+ * All model checkers that support the formula class InstantaneousReward must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IInstantaneousRewardModelChecker {
+ public:
+ /*!
+ * @brief Evaluates InstantaneousReward formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkInstantaneousReward(const InstantaneousReward<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with a Instantaneous Reward node as root.
+ * Class for a Abstract (path) formula tree with a Instantaneous Reward node as root.
*
* The subtrees are seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class InstantaneousReward : public PctlPathFormula<T> {
+class InstantaneousReward : public AbstractPathFormula<T> {
public:
/*!
@@ -84,9 +105,9 @@ public:
*
* Performs a "deep copy", i.e. the subtrees of the new object are clones of the original ones
*
- * @returns a new BoundedUntil-object that is identical the called object.
+ * @returns a new InstantaneousReward-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
return new InstantaneousReward(bound);
}
@@ -100,8 +121,20 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkInstantaneousReward(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IInstantaneousRewardModelChecker>()->checkInstantaneousReward(*this);
+ }
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * As InstantaneousReward formulas have no subformulas, we return true here.
+ *
+ * @param checker Formula checker object.
+ * @return true
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return true;
}
private:
diff --git a/src/formula/Next.h b/src/formula/Next.h
index 7b8214757..a91a39ce1 100644
--- a/src/formula/Next.h
+++ b/src/formula/Next.h
@@ -8,18 +8,39 @@
#ifndef STORM_FORMULA_NEXT_H_
#define STORM_FORMULA_NEXT_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
namespace storm {
namespace formula {
+template <class T> class Next;
+
+/*!
+ * @brief Interface class for model checkers that support Next.
+ *
+ * All model checkers that support the formula class Next must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class INextModelChecker {
+ public:
+ /*!
+ * @brief Evaluates Next formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkNext(const Next<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with a Next node as root.
+ * Class for a Abstract (path) formula tree with a Next node as root.
*
- * Has two PCTL state formulas as sub formulas/trees.
+ * Has two Abstract state formulas as sub formulas/trees.
*
* @par Semantics
* The formula holds iff in the next step, \e child holds
@@ -27,11 +48,11 @@ namespace formula {
* The subtree is seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class Next : public PctlPathFormula<T> {
+class Next : public AbstractPathFormula<T> {
public:
/*!
@@ -46,7 +67,7 @@ public:
*
* @param child The child node
*/
- Next(PctlStateFormula<T>* child) {
+ Next(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -65,7 +86,7 @@ public:
/*!
* @returns the child node
*/
- const PctlStateFormula<T>& getChild() const {
+ const AbstractStateFormula<T>& getChild() const {
return *child;
}
@@ -73,7 +94,7 @@ public:
* Sets the subtree
* @param child the new child node
*/
- void setChild(PctlStateFormula<T>* child) {
+ void setChild(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -95,7 +116,7 @@ public:
*
* @returns a new BoundedUntil-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
Next<T>* result = new Next<T>();
if (child != NULL) {
result->setChild(child);
@@ -112,12 +133,22 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkNext(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<INextModelChecker>()->checkNext(*this);
}
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->child);
+ }
private:
- PctlStateFormula<T>* child;
+ AbstractStateFormula<T>* child;
};
} //namespace formula
diff --git a/src/formula/NoBoundOperator.h b/src/formula/NoBoundOperator.h
index 4c4113f49..1a28b89d4 100644
--- a/src/formula/NoBoundOperator.h
+++ b/src/formula/NoBoundOperator.h
@@ -8,8 +8,9 @@
#ifndef STORM_FORMULA_NOBOUNDOPERATOR_H_
#define STORM_FORMULA_NOBOUNDOPERATOR_H_
-#include "PctlFormula.h"
-#include "PctlPathFormula.h"
+#include "AbstractFormula.h"
+#include "AbstractPathFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
#include "modelChecker/ForwardDeclarations.h"
@@ -17,19 +18,39 @@ namespace storm {
namespace formula {
+template <class T> class NoBoundOperator;
+
+/*!
+ * @brief Interface class for model checkers that support NoBoundOperator.
+ *
+ * All model checkers that support the formula class NoBoundOperator must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class INoBoundOperatorModelChecker {
+ public:
+ /*!
+ * @brief Evaluates NoBoundOperator formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkNoBoundOperator(const NoBoundOperator<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL formula tree with a P (probablistic) operator without declaration of probabilities
+ * Class for a Abstract formula tree with a P (probablistic) operator without declaration of probabilities
* as root.
*
* Checking a formula with this operator as root returns the probabilities that the path formula holds
* (for each state)
*
- * Has one PCTL path formula as sub formula/tree.
+ * Has one Abstract path formula as sub formula/tree.
*
* @note
* This class is a hybrid of a state and path formula, and may only appear as the outermost operator.
- * Hence, it is seen as neither a state nor a path formula, but is directly derived from PctlFormula.
+ * Hence, it is seen as neither a state nor a path formula, but is directly derived from AbstractFormula.
*
* @note
* This class does not contain a check() method like the other formula classes.
@@ -41,14 +62,14 @@ namespace formula {
* (this behavior can be prevented by setting them to NULL before deletion)
*
*
- * @see PctlStateFormula
- * @see PctlPathFormula
+ * @see AbstractStateFormula
+ * @see AbstractPathFormula
* @see ProbabilisticOperator
* @see ProbabilisticIntervalOperator
- * @see PctlFormula
+ * @see AbstractFormula
*/
template <class T>
-class NoBoundOperator: public storm::formula::PctlFormula<T> {
+class NoBoundOperator: public storm::formula::AbstractFormula<T> {
public:
/*!
* Empty constructor
@@ -62,7 +83,7 @@ public:
*
* @param pathFormula The child node.
*/
- NoBoundOperator(PctlPathFormula<T>* pathFormula) {
+ NoBoundOperator(AbstractPathFormula<T>* pathFormula) {
this->pathFormula = pathFormula;
}
@@ -76,9 +97,9 @@ public:
}
/*!
- * @returns the child node (representation of a PCTL path formula)
+ * @returns the child node (representation of a Abstract path formula)
*/
- const PctlPathFormula<T>& getPathFormula () const {
+ const AbstractPathFormula<T>& getPathFormula () const {
return *pathFormula;
}
@@ -87,7 +108,7 @@ public:
*
* @param pathFormula the path formula that becomes the new child node
*/
- void setPathFormula(PctlPathFormula<T>* pathFormula) {
+ void setPathFormula(AbstractPathFormula<T>* pathFormula) {
this->pathFormula = pathFormula;
}
@@ -102,17 +123,27 @@ public:
*
* @returns A vector indicating all states that satisfy the formula represented by the called object.
*/
- virtual std::vector<T>* check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkNoBoundOperator(*this);
+ virtual std::vector<T>* check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<INoBoundOperatorModelChecker>()->checkNoBoundOperator(*this);
}
/*!
* @returns a string representation of the formula
*/
virtual std::string toString() const = 0;
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->pathFormula);
+ }
private:
- PctlPathFormula<T>* pathFormula;
+ AbstractPathFormula<T>* pathFormula;
};
} /* namespace formula */
diff --git a/src/formula/Not.h b/src/formula/Not.h
index 03d5cf572..cd7a20399 100644
--- a/src/formula/Not.h
+++ b/src/formula/Not.h
@@ -8,26 +8,48 @@
#ifndef STORM_FORMULA_NOT_H_
#define STORM_FORMULA_NOT_H_
-#include "PctlStateFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelChecker/AbstractModelChecker.h"
namespace storm {
namespace formula {
+template <class T> class Not;
+
+/*!
+ * @brief Interface class for model checkers that support Not.
+ *
+ * All model checkers that support the formula class Not must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class INotModelChecker {
+ public:
+ /*!
+ * @brief Evaluates Not formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual storm::storage::BitVector* checkNot(const Not<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL formula tree with NOT node as root.
+ * Class for a Abstract formula tree with NOT node as root.
*
- * Has one PCTL state formula as sub formula/tree.
+ * Has one Abstract state formula as sub formula/tree.
*
* The subtree is seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlStateFormula
- * @see PctlFormula
+ * @see AbstractStateFormula
+ * @see AbstractFormula
*/
template <class T>
-class Not : public PctlStateFormula<T> {
+class Not : public AbstractStateFormula<T> {
public:
/*!
@@ -41,7 +63,7 @@ public:
* Constructor
* @param child The child node
*/
- Not(PctlStateFormula<T>* child) {
+ Not(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -60,7 +82,7 @@ public:
/*!
* @returns The child node
*/
- const PctlStateFormula<T>& getChild() const {
+ const AbstractStateFormula<T>& getChild() const {
return *child;
}
@@ -68,7 +90,7 @@ public:
* Sets the subtree
* @param child the new child node
*/
- void setChild(PctlStateFormula<T>* child) {
+ void setChild(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -88,7 +110,7 @@ public:
*
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const {
+ virtual AbstractStateFormula<T>* clone() const {
Not<T>* result = new Not<T>();
if (child != NULL) {
result->setChild(child);
@@ -105,12 +127,22 @@ public:
*
* @returns A bit vector indicating all states that satisfy the formula represented by the called object.
*/
- virtual storm::storage::BitVector *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkNot(*this);
+ virtual storm::storage::BitVector *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<INotModelChecker>()->checkNot(*this);
+ }
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->child);
}
private:
- PctlStateFormula<T>* child;
+ AbstractStateFormula<T>* child;
};
} //namespace formula
diff --git a/src/formula/Or.h b/src/formula/Or.h
index 524ca58e7..e7dd117e5 100644
--- a/src/formula/Or.h
+++ b/src/formula/Or.h
@@ -8,17 +8,37 @@
#ifndef STORM_FORMULA_OR_H_
#define STORM_FORMULA_OR_H_
-#include "PctlStateFormula.h"
+#include "src/formula/AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
namespace storm {
-
namespace formula {
+template <class T> class Or;
+
+/*!
+ * @brief Interface class for model checkers that support Or.
+ *
+ * All model checkers that support the formula class Or must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IOrModelChecker {
+ public:
+ /*!
+ * @brief Evaluates Or formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual storm::storage::BitVector* checkOr(const Or<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL formula tree with OR node as root.
+ * Class for a Abstract formula tree with OR node as root.
*
- * Has two PCTL state formulas as sub formulas/trees.
+ * Has two Abstract state formulas as sub formulas/trees.
*
* As OR is commutative, the order is \e theoretically not important, but will influence the order in which
* the model checker works.
@@ -26,11 +46,11 @@ namespace formula {
* The subtrees are seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlStateFormula
- * @see PctlFormula
+ * @see AbstractStateFormula
+ * @see AbstractFormula
*/
template <class T>
-class Or : public PctlStateFormula<T> {
+class Or : public AbstractStateFormula<T> {
public:
/*!
@@ -49,7 +69,7 @@ public:
* @param left The left sub formula
* @param right The right sub formula
*/
- Or(PctlStateFormula<T>* left, PctlStateFormula<T>* right) {
+ Or(AbstractStateFormula<T>* left, AbstractStateFormula<T>* right) {
this->left = left;
this->right = right;
}
@@ -74,7 +94,7 @@ public:
*
* @param newLeft the new left child.
*/
- void setLeft(PctlStateFormula<T>* newLeft) {
+ void setLeft(AbstractStateFormula<T>* newLeft) {
left = newLeft;
}
@@ -83,21 +103,21 @@ public:
*
* @param newRight the new right child.
*/
- void setRight(PctlStateFormula<T>* newRight) {
+ void setRight(AbstractStateFormula<T>* newRight) {
right = newRight;
}
/*!
* @returns a pointer to the left child node
*/
- const PctlStateFormula<T>& getLeft() const {
+ const AbstractStateFormula<T>& getLeft() const {
return *left;
}
/*!
* @returns a pointer to the right child node
*/
- const PctlStateFormula<T>& getRight() const {
+ const AbstractStateFormula<T>& getRight() const {
return *right;
}
@@ -120,7 +140,7 @@ public:
*
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const {
+ virtual AbstractStateFormula<T>* clone() const {
Or<T>* result = new Or();
if (this->left != NULL) {
result->setLeft(left->clone());
@@ -130,7 +150,7 @@ public:
}
return result;
}
-
+
/*!
* Calls the model checker to check this formula.
* Needed to infer the correct type of formula class.
@@ -140,13 +160,23 @@ public:
*
* @returns A bit vector indicating all states that satisfy the formula represented by the called object.
*/
- virtual storm::storage::BitVector *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkOr(*this);
+ virtual storm::storage::BitVector *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IOrModelChecker>()->checkOr(*this);
}
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff all subtrees conform to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->left) && checker.conforms(this->right);
+ }
private:
- PctlStateFormula<T>* left;
- PctlStateFormula<T>* right;
+ AbstractStateFormula<T>* left;
+ AbstractStateFormula<T>* right;
};
} //namespace formula
diff --git a/src/formula/PctlFormula.h b/src/formula/PctlFormula.h
deleted file mode 100644
index 394e3cfa2..000000000
--- a/src/formula/PctlFormula.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Pctlformula.h
- *
- * Created on: 19.10.2012
- * Author: Thomas Heinemann
- */
-
-#ifndef STORM_FORMULA_PCTLFORMULA_H_
-#define STORM_FORMULA_PCTLFORMULA_H_
-
-#include <string>
-
-namespace storm {
-
-namespace formula {
-
-
-//abstract
-/*!
- * @brief
- * Abstract base class for PCTL formulas in general.
- *
- * @attention This class is abstract.
- * @note Formula classes do not have copy constructors. The parameters of the constructors are usually the subtrees, so
- * the syntax conflicts with copy constructors for unary operators. To produce an identical object, the classes
- * PctlPathFormula and PctlStateFormula offer the method clone().
- */
-template <class T>
-class PctlFormula {
-
-public:
- /*!
- * virtual destructor
- */
- virtual ~PctlFormula() { }
-
- /*!
- * @note This function is not implemented in this class.
- * @returns a string representation of the formula
- */
- virtual std::string toString() const = 0;
-};
-
-} //namespace formula
-
-} //namespace storm
-
-#endif /* STORM_FORMULA_PCTLFORMULA_H_ */
diff --git a/src/formula/PrctlFormulaChecker.h b/src/formula/PrctlFormulaChecker.h
new file mode 100644
index 000000000..e99cb0666
--- /dev/null
+++ b/src/formula/PrctlFormulaChecker.h
@@ -0,0 +1,46 @@
+#ifndef STORM_FORMULA_PRCTLFORMULACHECKER_H_
+#define STORM_FORMULA_PRCTLFORMULACHECKER_H_
+
+#include "src/formula/AbstractFormulaChecker.h"
+#include "src/formula/Formulas.h"
+
+#include <iostream>
+
+namespace storm {
+namespace formula {
+
+/*!
+ * @brief Checks formulas if they are within PRCTL.
+ *
+ * This class implements AbstractFormulaChecker to check if a given formula
+ * is part of PRCTL logic.
+ */
+template <class T>
+class PrctlFormulaChecker : public AbstractFormulaChecker<T> {
+ public:
+ /*!
+ * Implementation of AbstractFormulaChecker::conforms() using code
+ * looking exactly like the sample code given there.
+ *
+ * We currently allow And, Ap, Eventually, Not, Or,
+ * ProbabilisticNoBoundOperator.
+ */
+ virtual bool conforms(const AbstractFormula<T>* formula) const {
+ if (
+ dynamic_cast<const And<T>*>(formula) ||
+ dynamic_cast<const Ap<T>*>(formula) ||
+ dynamic_cast<const Eventually<T>*>(formula) ||
+ dynamic_cast<const Not<T>*>(formula) ||
+ dynamic_cast<const Or<T>*>(formula) ||
+ dynamic_cast<const ProbabilisticNoBoundOperator<T>*>(formula)
+ ) {
+ return formula->conforms(*this);
+ }
+ return false;
+ }
+};
+
+} // namespace formula
+} // namespace storm
+
+#endif
\ No newline at end of file
diff --git a/src/formula/ProbabilisticBoundOperator.h b/src/formula/ProbabilisticBoundOperator.h
index be4ddfd4e..f679293d4 100644
--- a/src/formula/ProbabilisticBoundOperator.h
+++ b/src/formula/ProbabilisticBoundOperator.h
@@ -8,21 +8,20 @@
#ifndef STORM_FORMULA_PROBABILISTICBOUNDOPERATOR_H_
#define STORM_FORMULA_PROBABILISTICBOUNDOPERATOR_H_
-#include "PctlStateFormula.h"
-#include "PctlPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "AbstractPathFormula.h"
#include "BoundOperator.h"
#include "utility/ConstTemplates.h"
namespace storm {
-
namespace formula {
/*!
* @brief
- * Class for a PCTL formula tree with a P (probablistic) operator node over a probability interval
+ * Class for a Abstract formula tree with a P (probablistic) operator node over a probability interval
* as root.
*
- * Has one PCTL path formula as sub formula/tree.
+ * Has one Abstract path formula as sub formula/tree.
*
* @par Semantics
* The formula holds iff the probability that the path formula holds is inside the bounds
@@ -32,11 +31,11 @@ namespace formula {
* (this behavior can be prevented by setting them to NULL before deletion)
*
*
- * @see PctlStateFormula
- * @see PctlPathFormula
+ * @see AbstractStateFormula
+ * @see AbstractPathFormula
* @see ProbabilisticOperator
* @see ProbabilisticNoBoundsOperator
- * @see PctlFormula
+ * @see AbstractFormula
*/
template<class T>
class ProbabilisticBoundOperator : public BoundOperator<T> {
@@ -50,6 +49,7 @@ public:
// Intentionally left empty
}
+
/*!
* Constructor
*
@@ -58,7 +58,7 @@ public:
* @param pathFormula The child node
*/
ProbabilisticBoundOperator(
- typename BoundOperator<T>::ComparisonType comparisonRelation, T bound, PctlPathFormula<T>* pathFormula) :
+ typename BoundOperator<T>::ComparisonType comparisonRelation, T bound, AbstractPathFormula<T>* pathFormula) :
BoundOperator<T>(comparisonRelation, bound, pathFormula) {
// Intentionally left empty
}
@@ -79,7 +79,7 @@ public:
*
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const {
+ virtual AbstractStateFormula<T>* clone() const {
ProbabilisticBoundOperator<T>* result = new ProbabilisticBoundOperator<T>();
result->setComparisonOperator(this->getComparisonOperator());
result->setBound(this->getBound());
@@ -89,7 +89,6 @@ public:
};
} //namespace formula
-
} //namespace storm
#endif /* STORM_FORMULA_PROBABILISTICBOUNDOPERATOR_H_ */
diff --git a/src/formula/ProbabilisticNoBoundOperator.h b/src/formula/ProbabilisticNoBoundOperator.h
index dd79d64d5..c3ac9c248 100644
--- a/src/formula/ProbabilisticNoBoundOperator.h
+++ b/src/formula/ProbabilisticNoBoundOperator.h
@@ -8,27 +8,26 @@
#ifndef STORM_FORMULA_PROBABILISTICNOBOUNDOPERATOR_H_
#define STORM_FORMULA_PROBABILISTICNOBOUNDOPERATOR_H_
-#include "PctlFormula.h"
-#include "PctlPathFormula.h"
+#include "AbstractFormula.h"
+#include "AbstractPathFormula.h"
#include "NoBoundOperator.h"
namespace storm {
-
namespace formula {
/*!
* @brief
- * Class for a PCTL formula tree with a P (probablistic) operator without declaration of probabilities
+ * Class for a Abstract formula tree with a P (probablistic) operator without declaration of probabilities
* as root.
*
* Checking a formula with this operator as root returns the probabilities that the path formula holds
* (for each state)
*
- * Has one PCTL path formula as sub formula/tree.
+ * Has one Abstract path formula as sub formula/tree.
*
* @note
* This class is a hybrid of a state and path formula, and may only appear as the outermost operator.
- * Hence, it is seen as neither a state nor a path formula, but is directly derived from PctlFormula.
+ * Hence, it is seen as neither a state nor a path formula, but is directly derived from AbstractFormula.
*
* @note
* This class does not contain a check() method like the other formula classes.
@@ -40,11 +39,11 @@ namespace formula {
* (this behavior can be prevented by setting them to NULL before deletion)
*
*
- * @see PctlStateFormula
- * @see PctlPathFormula
+ * @see AbstractStateFormula
+ * @see AbstractPathFormula
* @see ProbabilisticOperator
* @see ProbabilisticIntervalOperator
- * @see PctlFormula
+ * @see AbstractFormula
*/
template <class T>
class ProbabilisticNoBoundOperator: public NoBoundOperator<T> {
@@ -61,7 +60,7 @@ public:
*
* @param pathFormula The child node.
*/
- ProbabilisticNoBoundOperator(PctlPathFormula<T>* pathFormula) : NoBoundOperator<T>(pathFormula) {
+ ProbabilisticNoBoundOperator(AbstractPathFormula<T>* pathFormula) : NoBoundOperator<T>(pathFormula) {
// Intentionally left empty
}
@@ -77,7 +76,6 @@ public:
};
} /* namespace formula */
-
} /* namespace storm */
#endif /* STORM_FORMULA_PROBABILISTICNOBOUNDOPERATOR_H_ */
diff --git a/src/formula/ReachabilityReward.h b/src/formula/ReachabilityReward.h
index 9f5d6ee43..54e2f447b 100644
--- a/src/formula/ReachabilityReward.h
+++ b/src/formula/ReachabilityReward.h
@@ -8,27 +8,48 @@
#ifndef STORM_FORMULA_REACHABILITYREWARD_H_
#define STORM_FORMULA_REACHABILITYREWARD_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "src/formula/AbstractPathFormula.h"
+#include "src/formula/AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
+#include "src/modelChecker/AbstractModelChecker.h"
namespace storm {
-
namespace formula {
+template <class T> class ReachabilityReward;
+
+/*!
+ * @brief Interface class for model checkers that support ReachabilityReward.
+ *
+ * All model checkers that support the formula class ReachabilityReward must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IReachabilityRewardModelChecker {
+ public:
+ /*!
+ * @brief Evaluates ReachabilityReward formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkReachabilityReward(const ReachabilityReward<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with an Reachability Reward node as root.
+ * Class for a Abstract (path) formula tree with an Reachability Reward node as root.
*
- * Has one PCTL state formula as sub formula/tree.
+ * Has one Abstract state formula as sub formula/tree.
*
* The subtree is seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to nullptr before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class ReachabilityReward : public PctlPathFormula<T> {
+class ReachabilityReward : public AbstractPathFormula<T> {
public:
/*!
@@ -43,7 +64,7 @@ public:
*
* @param child The child node
*/
- ReachabilityReward(PctlStateFormula<T>* child) {
+ ReachabilityReward(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -62,7 +83,7 @@ public:
/*!
* @returns the child node
*/
- const PctlStateFormula<T>& getChild() const {
+ const AbstractStateFormula<T>& getChild() const {
return *child;
}
@@ -70,7 +91,7 @@ public:
* Sets the subtree
* @param child the new child node
*/
- void setChild(PctlStateFormula<T>* child) {
+ void setChild(AbstractStateFormula<T>* child) {
this->child = child;
}
@@ -88,9 +109,9 @@ public:
*
* Performs a "deep copy", i.e. the subtrees of the new object are clones of the original ones
*
- * @returns a new BoundedUntil-object that is identical the called object.
+ * @returns a new ReachabilityReward-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
ReachabilityReward<T>* result = new ReachabilityReward<T>();
if (child != nullptr) {
result->setChild(child);
@@ -107,16 +128,25 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkReachabilityReward(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IReachabilityRewardModelChecker>()->checkReachabilityReward(*this);
+ }
+
+ /*!
+ * @brief Checks if the subtree conforms to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff the subtree conforms to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->child);
}
private:
- PctlStateFormula<T>* child;
+ AbstractStateFormula<T>* child;
};
} //namespace formula
-
} //namespace storm
#endif /* STORM_FORMULA_REACHABILITYREWARD_H_ */
diff --git a/src/formula/RewardBoundOperator.h b/src/formula/RewardBoundOperator.h
index 34b4d1084..611280483 100644
--- a/src/formula/RewardBoundOperator.h
+++ b/src/formula/RewardBoundOperator.h
@@ -8,18 +8,17 @@
#ifndef STORM_FORMULA_REWARDBOUNDOPERATOR_H_
#define STORM_FORMULA_REWARDBOUNDOPERATOR_H_
-#include "PctlStateFormula.h"
-#include "PctlPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "AbstractPathFormula.h"
#include "BoundOperator.h"
#include "utility/ConstTemplates.h"
namespace storm {
-
namespace formula {
/*!
* @brief
- * Class for a PCTL formula tree with a R (reward) operator node over a reward interval as root.
+ * Class for a Abstract formula tree with a R (reward) operator node over a reward interval as root.
*
* Has a reward path formula as sub formula/tree.
*
@@ -31,11 +30,11 @@ namespace formula {
* (this behavior can be prevented by setting them to NULL before deletion)
*
*
- * @see PctlStateFormula
- * @see PctlPathFormula
+ * @see AbstractStateFormula
+ * @see AbstractPathFormula
* @see ProbabilisticOperator
* @see ProbabilisticNoBoundsOperator
- * @see PctlFormula
+ * @see AbstractFormula
*/
template<class T>
class RewardBoundOperator : public BoundOperator<T> {
@@ -56,7 +55,7 @@ public:
* @param pathFormula The child node
*/
RewardBoundOperator(
- typename BoundOperator<T>::ComparisonType comparisonRelation, T bound, PctlPathFormula<T>* pathFormula) :
+ typename BoundOperator<T>::ComparisonType comparisonRelation, T bound, AbstractPathFormula<T>* pathFormula) :
BoundOperator<T>(comparisonRelation, bound, pathFormula) {
// Intentionally left empty
}
@@ -77,7 +76,7 @@ public:
*
* @returns a new AND-object that is identical the called object.
*/
- virtual PctlStateFormula<T>* clone() const {
+ virtual AbstractStateFormula<T>* clone() const {
RewardBoundOperator<T>* result = new RewardBoundOperator<T>();
result->setComparisonOperator(this->getComparisonOperator());
result->setBound(this->getBound());
@@ -87,7 +86,6 @@ public:
};
} //namespace formula
-
} //namespace storm
#endif /* STORM_FORMULA_REWARDBOUNDOPERATOR_H_ */
diff --git a/src/formula/RewardNoBoundOperator.h b/src/formula/RewardNoBoundOperator.h
index 91e0c89f0..6765bc854 100644
--- a/src/formula/RewardNoBoundOperator.h
+++ b/src/formula/RewardNoBoundOperator.h
@@ -8,27 +8,26 @@
#ifndef STORM_FORMULA_REWARDNOBOUNDOPERATOR_H_
#define STORM_FORMULA_REWARDNOBOUNDOPERATOR_H_
-#include "PctlFormula.h"
-#include "PctlPathFormula.h"
+#include "AbstractFormula.h"
+#include "AbstractPathFormula.h"
#include "NoBoundOperator.h"
namespace storm {
-
namespace formula {
/*!
* @brief
- * Class for a PCTL formula tree with a R (reward) operator without declaration of reward values
+ * Class for a Abstract formula tree with a R (reward) operator without declaration of reward values
* as root.
*
* Checking a formula with this operator as root returns the reward for the reward path formula for
* each state
*
- * Has one PCTL path formula as sub formula/tree.
+ * Has one Abstract path formula as sub formula/tree.
*
* @note
* This class is a hybrid of a state and path formula, and may only appear as the outermost operator.
- * Hence, it is seen as neither a state nor a path formula, but is directly derived from PctlFormula.
+ * Hence, it is seen as neither a state nor a path formula, but is directly derived from AbstractFormula.
*
* @note
* This class does not contain a check() method like the other formula classes.
@@ -40,11 +39,11 @@ namespace formula {
* (this behavior can be prevented by setting them to NULL before deletion)
*
*
- * @see PctlStateFormula
- * @see PctlPathFormula
+ * @see AbstractStateFormula
+ * @see AbstractPathFormula
* @see ProbabilisticOperator
* @see ProbabilisticIntervalOperator
- * @see PctlFormula
+ * @see AbstractFormula
*/
template <class T>
class RewardNoBoundOperator: public NoBoundOperator<T> {
@@ -61,7 +60,7 @@ public:
*
* @param pathFormula The child node.
*/
- RewardNoBoundOperator(PctlPathFormula<T>* pathFormula) : NoBoundOperator<T>(pathFormula) {
+ RewardNoBoundOperator(AbstractPathFormula<T>* pathFormula) : NoBoundOperator<T>(pathFormula) {
// Intentionally left empty
}
@@ -77,7 +76,6 @@ public:
};
} /* namespace formula */
-
} /* namespace storm */
#endif /* STORM_FORMULA_REWARDNOBOUNDOPERATOR_H_ */
diff --git a/src/formula/Until.h b/src/formula/Until.h
index be86a1153..82ac05c9d 100644
--- a/src/formula/Until.h
+++ b/src/formula/Until.h
@@ -8,18 +8,38 @@
#ifndef STORM_FORMULA_UNTIL_H_
#define STORM_FORMULA_UNTIL_H_
-#include "PctlPathFormula.h"
-#include "PctlStateFormula.h"
+#include "AbstractPathFormula.h"
+#include "AbstractStateFormula.h"
+#include "src/formula/AbstractFormulaChecker.h"
namespace storm {
-
namespace formula {
+template <class T> class Until;
+
+/*!
+ * @brief Interface class for model checkers that support Until.
+ *
+ * All model checkers that support the formula class Until must inherit
+ * this pure virtual class.
+ */
+template <class T>
+class IUntilModelChecker {
+ public:
+ /*!
+ * @brief Evaluates Until formula within a model checker.
+ *
+ * @param obj Formula object with subformulas.
+ * @return Result of the formula for every node.
+ */
+ virtual std::vector<T>* checkUntil(const Until<T>& obj) const = 0;
+};
+
/*!
* @brief
- * Class for a PCTL (path) formula tree with an Until node as root.
+ * Class for a Abstract (path) formula tree with an Until node as root.
*
- * Has two PCTL state formulas as sub formulas/trees.
+ * Has two Abstract state formulas as sub formulas/trees.
*
* @par Semantics
* The formula holds iff eventually, formula \e right (the right subtree) holds, and before,
@@ -28,11 +48,11 @@ namespace formula {
* The subtrees are seen as part of the object and deleted with the object
* (this behavior can be prevented by setting them to NULL before deletion)
*
- * @see PctlPathFormula
- * @see PctlFormula
+ * @see AbstractPathFormula
+ * @see AbstractFormula
*/
template <class T>
-class Until : public PctlPathFormula<T> {
+class Until : public AbstractPathFormula<T> {
public:
/*!
@@ -49,7 +69,7 @@ public:
* @param left The left formula subtree
* @param right The left formula subtree
*/
- Until(PctlStateFormula<T>* left, PctlStateFormula<T>* right) {
+ Until(AbstractStateFormula<T>* left, AbstractStateFormula<T>* right) {
this->left = left;
this->right = right;
}
@@ -74,7 +94,7 @@ public:
*
* @param newLeft the new left child.
*/
- void setLeft(PctlStateFormula<T>* newLeft) {
+ void setLeft(AbstractStateFormula<T>* newLeft) {
left = newLeft;
}
@@ -83,21 +103,21 @@ public:
*
* @param newRight the new right child.
*/
- void setRight(PctlStateFormula<T>* newRight) {
+ void setRight(AbstractStateFormula<T>* newRight) {
right = newRight;
}
/*!
* @returns a pointer to the left child node
*/
- const PctlStateFormula<T>& getLeft() const {
+ const AbstractStateFormula<T>& getLeft() const {
return *left;
}
/*!
* @returns a pointer to the right child node
*/
- const PctlStateFormula<T>& getRight() const {
+ const AbstractStateFormula<T>& getRight() const {
return *right;
}
@@ -120,7 +140,7 @@ public:
*
* @returns a new BoundedUntil-object that is identical the called object.
*/
- virtual PctlPathFormula<T>* clone() const {
+ virtual AbstractPathFormula<T>* clone() const {
Until<T>* result = new Until();
if (left != NULL) {
result->setLeft(left->clone());
@@ -140,13 +160,23 @@ public:
*
* @returns A vector indicating the probability that the formula holds for each state.
*/
- virtual std::vector<T> *check(const storm::modelChecker::DtmcPrctlModelChecker<T>& modelChecker) const {
- return modelChecker.checkUntil(*this);
+ virtual std::vector<T> *check(const storm::modelChecker::AbstractModelChecker<T>& modelChecker) const {
+ return modelChecker.template as<IUntilModelChecker>()->checkUntil(*this);
}
+
+ /*!
+ * @brief Checks if all subtrees conform to some logic.
+ *
+ * @param checker Formula checker object.
+ * @return true iff all subtrees conform to some logic.
+ */
+ virtual bool conforms(const AbstractFormulaChecker<T>& checker) const {
+ return checker.conforms(this->left) && checker.conforms(this->right);
+ }
private:
- PctlStateFormula<T>* left;
- PctlStateFormula<T>* right;
+ AbstractStateFormula<T>* left;
+ AbstractStateFormula<T>* right;
};
} //namespace formula
diff --git a/src/modelChecker/AbstractModelChecker.h b/src/modelChecker/AbstractModelChecker.h
new file mode 100644
index 000000000..110d355dd
--- /dev/null
+++ b/src/modelChecker/AbstractModelChecker.h
@@ -0,0 +1,57 @@
+/*
+ * DtmcPrctlModelChecker.h
+ *
+ * Created on: 22.10.2012
+ * Author: Thomas Heinemann
+ */
+
+#ifndef STORM_MODELCHECKER_ABSTRACTMODELCHECKER_H_
+#define STORM_MODELCHECKER_ABSTRACTMODELCHECKER_H_
+
+namespace storm { namespace modelChecker {
+template <class Type> class AbstractModelChecker;
+}}
+
+//#include "src/formula/Formulas.h"
+#include "src/formula/Or.h"
+#include "src/formula/Ap.h"
+#include "src/storage/BitVector.h"
+
+#include <iostream>
+
+namespace storm {
+namespace modelChecker {
+
+/*!
+ * @brief
+ * Interface for model checker classes.
+ *
+ * This class provides basic functions that are the same for all subclasses, but mainly only declares
+ * abstract methods that are to be implemented in concrete instances.
+ *
+ * @attention This class is abstract.
+ */
+template<class Type>
+class AbstractModelChecker :
+ public virtual storm::formula::IOrModelChecker<Type>,
+ public virtual storm::formula::IApModelChecker<Type>
+ {
+
+public:
+ template <template <class T> class Target>
+ const Target<Type>* as() const {
+ try {
+ const Target<Type>* target = dynamic_cast<const Target<Type>*>(this);
+ return target;
+ } catch (std::bad_cast& bc) {
+ std::cerr << "Bad cast: tried to cast " << typeid(*this).name() << " to " << typeid(Target<Type>).name() << std::endl;
+ }
+ return nullptr;
+ }
+};
+
+} //namespace modelChecker
+
+} //namespace storm
+
+#endif /* STORM_MODELCHECKER_DTMCPRCTLMODELCHECKER_H_ */
diff --git a/src/modelChecker/DtmcPrctlModelChecker.h b/src/modelChecker/DtmcPrctlModelChecker.h
index c6e71f613..77648de2a 100644
--- a/src/modelChecker/DtmcPrctlModelChecker.h
+++ b/src/modelChecker/DtmcPrctlModelChecker.h
@@ -16,6 +16,7 @@
#include "src/storage/BitVector.h"
#include "src/exceptions/InvalidPropertyException.h"
#include "src/utility/Vector.h"
+#include "src/modelChecker/AbstractModelChecker.h"
#include <vector>
#include "log4cplus/logger.h"
@@ -37,7 +38,12 @@ namespace modelChecker {
* @attention This class is abstract.
*/
template<class Type>
-class DtmcPrctlModelChecker {
+class DtmcPrctlModelChecker :
+ public virtual AbstractModelChecker<Type>,
+ public virtual storm::formula::INoBoundOperatorModelChecker<Type>,
+ public virtual storm::formula::IReachabilityRewardModelChecker<Type>,
+ public virtual storm::formula::IEventuallyModelChecker<Type>
+ {
public:
/*!
* Constructor
@@ -84,7 +90,7 @@ public:
* states.
* @param stateFormula The formula to be checked.
*/
- void check(const storm::formula::PctlStateFormula<Type>& stateFormula) const {
+ void check(const storm::formula::AbstractStateFormula<Type>& stateFormula) const {
std::cout << std::endl;
LOG4CPLUS_INFO(logger, "Model checking formula\t" << stateFormula.toString());
std::cout << "Model checking formula:\t" << stateFormula.toString() << std::endl;
@@ -144,7 +150,7 @@ public:
* @param formula The state formula to check
* @returns The set of states satisfying the formula, represented by a bit vector
*/
- storm::storage::BitVector* checkStateFormula(const storm::formula::PctlStateFormula<Type>& formula) const {
+ storm::storage::BitVector* checkStateFormula(const storm::formula::AbstractStateFormula<Type>& formula) const {
return formula.check(*this);
}
@@ -201,7 +207,7 @@ public:
* @param formula The Or state formula to check
* @returns The set of states satisfying the formula, represented by a bit vector
*/
- storm::storage::BitVector* checkOr(const storm::formula::Or<Type>& formula) const {
+ virtual storm::storage::BitVector* checkOr(const storm::formula::Or<Type>& formula) const {
storm::storage::BitVector* result = checkStateFormula(formula.getLeft());
storm::storage::BitVector* right = checkStateFormula(formula.getRight());
(*result) |= (*right);
@@ -254,7 +260,7 @@ public:
* @param formula The path formula to check
* @returns for each state the probability that the path formula holds.
*/
- std::vector<Type>* checkPathFormula(const storm::formula::PctlPathFormula<Type>& formula) const {
+ std::vector<Type>* checkPathFormula(const storm::formula::AbstractPathFormula<Type>& formula) const {
return formula.check(*this);
}
diff --git a/src/modelChecker/EigenDtmcPrctlModelChecker.h b/src/modelChecker/EigenDtmcPrctlModelChecker.h
index e6ea58725..25bf4984b 100644
--- a/src/modelChecker/EigenDtmcPrctlModelChecker.h
+++ b/src/modelChecker/EigenDtmcPrctlModelChecker.h
@@ -18,6 +18,7 @@
#include "Eigen/Sparse"
#include "Eigen/src/IterativeLinearSolvers/BiCGSTAB.h"
+#include "src/adapters/EigenAdapter.h"
#include "gmm/gmm_matrix.h"
#include "gmm/gmm_iter_solvers.h"
@@ -54,7 +55,7 @@ public:
tmpMatrix.makeRowsAbsorbing((~*leftStates | *rightStates) | *rightStates);
// Transform the transition probability matrix to the eigen format to use its arithmetic.
- Eigen::SparseMatrix<Type, 1, int_fast32_t>* eigenMatrix = tmpMatrix.toEigenSparseMatrix();
+ Eigen::SparseMatrix<Type, 1, int_fast32_t>* eigenMatrix = storm::adapters::EigenAdapter::toEigenSparseMatrix(tmpMatrix);
// Create the vector with which to multiply.
uint_fast64_t stateCount = this->getModel().getNumberOfStates();
@@ -87,8 +88,8 @@ public:
// First, we need to compute the states that satisfy the sub-formula of the next-formula.
storm::storage::BitVector* nextStates = this->checkStateFormula(formula.getChild());
- // Transform the transition probability matrix to the gmm++ format to use its arithmetic.
- Eigen::SparseMatrix<Type, 1, int_fast32_t>* eigenMatrix = this->getModel().getTransitionProbabilityMatrix()->toEigenSparseMatrix();
+ // Transform the transition probability matrix to the eigen format to use its arithmetic.
+ Eigen::SparseMatrix<Type, 1, int_fast32_t>* eigenMatrix = storm::adapters::EigenAdapter::toEigenSparseMatrix(this->getModel().getTransitionProbabilityMatrix());
// Create the vector with which to multiply and initialize it correctly.
std::vector<Type> x(this->getModel().getNumberOfStates());
@@ -154,7 +155,7 @@ public:
submatrix->convertToEquationSystem();
// Transform the submatric matrix to the eigen format to use its solvers
- Eigen::SparseMatrix<Type, 1, int_fast32_t>* eigenSubMatrix = submatrix->toEigenSparseMatrix();
+ Eigen::SparseMatrix<Type, 1, int_fast32_t>* eigenSubMatrix = storm::adapters::EigenAdapter::toEigenSparseMatrix<Type>(submatrix);
delete submatrix;
// Initialize the x vector with 0.5 for each element. This is the initial guess for
diff --git a/src/modelChecker/GmmxxDtmcPrctlModelChecker.h b/src/modelChecker/GmmxxDtmcPrctlModelChecker.h
index c90efc3b0..0c54d63cf 100644
--- a/src/modelChecker/GmmxxDtmcPrctlModelChecker.h
+++ b/src/modelChecker/GmmxxDtmcPrctlModelChecker.h
@@ -18,6 +18,7 @@
#include "src/utility/Settings.h"
#include "src/adapters/GmmxxAdapter.h"
#include "src/exceptions/InvalidPropertyException.h"
+#include "src/storage/JacobiDecomposition.h"
#include "gmm/gmm_matrix.h"
#include "gmm/gmm_iter_solvers.h"
@@ -128,7 +129,8 @@ public:
std::vector<Type>* result = new std::vector<Type>(this->getModel().getNumberOfStates());
// Only try to solve system if there are states for which the probability is unknown.
- if (maybeStates.getNumberOfSetBits() > 0) {
+ uint_fast64_t mayBeStatesSetBitCount = maybeStates.getNumberOfSetBits();
+ if (mayBeStatesSetBitCount > 0) {
// Now we can eliminate the rows and columns from the original transition probability matrix.
storm::storage::SparseMatrix<Type>* submatrix = this->getModel().getTransitionProbabilityMatrix()->getSubmatrix(maybeStates);
// Converting the matrix from the fixpoint notation to the form needed for the equation
@@ -142,11 +144,11 @@ public:
// Initialize the x vector with 0.5 for each element. This is the initial guess for
// the iterative solvers. It should be safe as for all 'maybe' states we know that the
// probability is strictly larger than 0.
- std::vector<Type> x(maybeStates.getNumberOfSetBits(), Type(0.5));
+ std::vector<Type> x(mayBeStatesSetBitCount, Type(0.5));
// Prepare the right-hand side of the equation system. For entry i this corresponds to
// the accumulated probability of going from state i to some 'yes' state.
- std::vector<Type> b(maybeStates.getNumberOfSetBits());
+ std::vector<Type> b(mayBeStatesSetBitCount);
this->getModel().getTransitionProbabilityMatrix()->getConstrainedRowCountVector(maybeStates, alwaysPhiUntilPsiStates, &b);
// Solve the corresponding system of linear equations.
@@ -259,7 +261,8 @@ public:
// Check whether there are states for which we have to compute the result.
storm::storage::BitVector maybeStates = ~(*targetStates) & ~infinityStates;
- if (maybeStates.getNumberOfSetBits() > 0) {
+ const int maybeStatesSetBitCount = maybeStates.getNumberOfSetBits();
+ if (maybeStatesSetBitCount > 0) {
// Now we can eliminate the rows and columns from the original transition probability matrix.
storm::storage::SparseMatrix<Type>* submatrix = this->getModel().getTransitionProbabilityMatrix()->getSubmatrix(maybeStates);
// Converting the matrix from the fixpoint notation to the form needed for the equation
@@ -272,10 +275,10 @@ public:
// Initialize the x vector with 1 for each element. This is the initial guess for
// the iterative solvers.
- std::vector<Type> x(maybeStates.getNumberOfSetBits(), storm::utility::constGetOne<Type>());
+ std::vector<Type> x(maybeStatesSetBitCount, storm::utility::constGetOne<Type>());
// Prepare the right-hand side of the equation system.
- std::vector<Type>* b = new std::vector<Type>(maybeStates.getNumberOfSetBits());
+ std::vector<Type>* b = new std::vector<Type>(maybeStatesSetBitCount);
if (this->getModel().hasTransitionRewards()) {
// If a transition-based reward model is available, we initialize the right-hand
// side to the vector resulting from summing the rows of the pointwise product
@@ -289,7 +292,7 @@ public:
// as well. As the state reward vector contains entries not just for the states
// that we still consider (i.e. maybeStates), we need to extract these values
// first.
- std::vector<Type>* subStateRewards = new std::vector<Type>(maybeStates.getNumberOfSetBits());
+ std::vector<Type>* subStateRewards = new std::vector<Type>(maybeStatesSetBitCount);
storm::utility::setVectorValues(subStateRewards, maybeStates, *this->getModel().getStateRewards());
gmm::add(*subStateRewards, *b);
delete subStateRewards;
@@ -444,6 +447,64 @@ private:
LOG4CPLUS_WARN(logger, "Iterative solver did not converge.");
}
}
+
+ /*!
+ * Solves the linear equation system Ax=b with the given parameters
+ * using the Jacobi Method and therefor the Jacobi Decomposition of A.
+ *
+ * @param A The matrix A specifying the coefficients of the linear equations.
+ * @param x The vector x for which to solve the equations. The initial value of the elements of
+ * this vector are used as the initial guess and might thus influence performance and convergence.
+ * @param b The vector b specifying the values on the right-hand-sides of the equations.
+ * @return The solution of the system of linear equations in form of the elements of the vector
+ * x.
+ */
+ void solveLinearEquationSystemWithJacobi(storm::storage::SparseMatrix<Type> const& A, std::vector<Type>& x, std::vector<Type> const& b) const {
+ // Get the settings object to customize linear solving.
+ storm::settings::Settings* s = storm::settings::instance();
+
+ double precision = s->get<double>("precision");
+ if (precision <= 0) {
+ LOG4CPLUS_ERROR(logger, "Selected precision for linear equation solving must be strictly greater than zero for Jacobi method.");
+ }
+
+ // Get a Jacobi Decomposition of the Input Matrix A
+ storm::storage::JacobiDecomposition<Type>* jacobiDecomposition = A.getJacobiDecomposition();
+
+ // Convert the Diagonal matrix to GMM format
+ gmm::csr_matrix<Type>* gmmxxDiagonalInverted = storm::adapters::GmmxxAdapter::toGmmxxSparseMatrix<Type>(jacobiDecomposition->getJacobiDInv());
+ // Convert the LU Matrix to GMM format
+ gmm::csr_matrix<Type>* gmmxxLU = storm::adapters::GmmxxAdapter::toGmmxxSparseMatrix<Type>(jacobiDecomposition->getJacobiLU());
+
+ delete jacobiDecomposition;
+
+ LOG4CPLUS_INFO(logger, "Starting iterative Jacobi Solver.");
+
+ // x_(k + 1) = D^-1 * (b - R * x_k)
+ std::vector<Type>* xNext = new std::vector<Type>(x.size());
+ const std::vector<Type>* xCopy = xNext;
+ std::vector<Type>* xCurrent = &x;
+
+ uint_fast64_t iterationCount = 0;
+ do {
+ // R * x_k -> xCurrent
+ gmm::mult(*gmmxxLU, *xCurrent, *xNext);
+ // b - R * x_k
+ gmm::add(b, gmm::scaled(*xNext, -1.0), *xNext);
+ // D^-1 * (b - R * x_k)
+ gmm::mult(*gmmxxDiagonalInverted, *xNext, *xNext);
+
+ std::vector<Type>* swap = xNext;
+ xNext = xCurrent;
+ xCurrent = swap;
+
+ ++iterationCount;
+ } while (gmm::vect_norminf(*xCurrent) > precision);
+
+ delete xCopy;
+
+ LOG4CPLUS_INFO(logger, "Iterative solver converged after " << iterationCount << " iterations.");
+ }
};
} //namespace modelChecker
diff --git a/src/models/Mdp.h b/src/models/Mdp.h
index dc58782a2..5b9d0157f 100644
--- a/src/models/Mdp.h
+++ b/src/models/Mdp.h
@@ -20,6 +20,7 @@
#include "src/utility/CommandLine.h"
#include "src/utility/Settings.h"
#include "src/models/AbstractModel.h"
+#include "src/parser/NonDeterministicSparseTransitionParser.h"
namespace storm {
@@ -44,9 +45,10 @@ public:
*/
Mdp(std::shared_ptr<storm::storage::SparseMatrix<T>> probabilityMatrix,
std::shared_ptr<storm::models::AtomicPropositionsLabeling> stateLabeling,
+ std::shared_ptr<std::vector<uint_fast64_t>> rowMapping,
std::shared_ptr<std::vector<T>> stateRewards = nullptr,
std::shared_ptr<storm::storage::SparseMatrix<T>> transitionRewardMatrix = nullptr)
- : probabilityMatrix(probabilityMatrix), stateLabeling(stateLabeling),
+ : probabilityMatrix(probabilityMatrix), stateLabeling(stateLabeling), rowMapping(rowMapping),
stateRewards(stateRewards), transitionRewardMatrix(transitionRewardMatrix),
backwardTransitions(nullptr) {
if (!this->checkValidityOfProbabilityMatrix()) {
@@ -61,7 +63,7 @@ public:
* @param mdp A reference to the MDP that is to be copied.
*/
Mdp(const Mdp<T> &mdp) : probabilityMatrix(mdp.probabilityMatrix),
- stateLabeling(mdp.stateLabeling), stateRewards(mdp.stateRewards),
+ stateLabeling(mdp.stateLabeling), rowMapping(mdp.rowMapping), stateRewards(mdp.stateRewards),
transitionRewardMatrix(mdp.transitionRewardMatrix) {
if (mdp.backwardTransitions != nullptr) {
this->backwardTransitions = new storm::models::GraphTransitions<T>(*mdp.backwardTransitions);
@@ -225,6 +227,9 @@ private:
/*! The labeling of the states of the MDP. */
std::shared_ptr<storm::models::AtomicPropositionsLabeling> stateLabeling;
+
+ /*! The mapping from states to rows. */
+ std::shared_ptr<std::vector<uint_fast64_t>> rowMapping;
/*! The state-based rewards of the MDP. */
std::shared_ptr<std::vector<T>> stateRewards;
diff --git a/src/parser/DeterministicSparseTransitionParser.cpp b/src/parser/DeterministicSparseTransitionParser.cpp
index 59eb336d7..b4446be5b 100644
--- a/src/parser/DeterministicSparseTransitionParser.cpp
+++ b/src/parser/DeterministicSparseTransitionParser.cpp
@@ -45,8 +45,8 @@ namespace parser {
* @param maxnode Is set to highest id of all nodes.
*/
uint_fast64_t DeterministicSparseTransitionParser::firstPass(char* buf, int_fast64_t& maxnode) {
- uint_fast64_t non_zero = 0;
-
+ uint_fast64_t nonZeroEntryCount = 0;
+ uint_fast64_t inputFileNonZeroEntryCount = 0;
/*
* Check file header and extract number of transitions.
*/
@@ -63,47 +63,72 @@ uint_fast64_t DeterministicSparseTransitionParser::firstPass(char* buf, int_fast
return 0;
}
buf += 12; // skip "TRANSITIONS "
- if ((non_zero = strtol(buf, &buf, 10)) == 0) return 0;
+ if ((inputFileNonZeroEntryCount = strtol(buf, &buf, 10)) == 0) return 0;
- /*
- * Check all transitions for non-zero diagonal entrys.
- */
- int_fast64_t row, lastrow = -1, col;
- double val;
- maxnode = 0;
- while (buf[0] != '\0') {
- /*
- * Read row and column.
- */
- row = checked_strtol(buf, &buf);
- col = checked_strtol(buf, &buf);
- /*
- * Check if one is larger than the current maximum id.
- */
- if (row > maxnode) maxnode = row;
- if (col > maxnode) maxnode = col;
- /*
- * Check if a node was skipped, i.e. if a node has no outgoing
- * transitions. If so, increase non_zero, as the second pass will
- * either throw an exception (in this case, it doesn't matter
- * anyway) or add a self-loop (in this case, we'll need the
- * additional transition).
- */
- if (lastrow < row - 1) non_zero += row - lastrow - 1;
- lastrow = row;
- /*
- * Read probability of this transition.
- * Check, if the value is a probability, i.e. if it is between 0 and 1.
- */
- val = checked_strtod(buf, &buf);
- if ((val < 0.0) || (val > 1.0)) {
- LOG4CPLUS_ERROR(logger, "Expected a positive probability but got \"" << val << "\".");
- return 0;
- }
- buf = trimWhitespaces(buf);
+ /*
+ * Check all transitions for non-zero diagonal entries and deadlock states.
+ */
+ int_fast64_t row, lastRow = -1, col;
+ uint_fast64_t readTransitionCount = 0;
+ bool rowHadDiagonalEntry = false;
+ double val;
+ maxnode = 0;
+ while (buf[0] != '\0') {
+ /*
+ * Read row and column.
+ */
+ row = checked_strtol(buf, &buf);
+ col = checked_strtol(buf, &buf);
+
+ if (lastRow != row) {
+ if ((lastRow != -1) && (!rowHadDiagonalEntry)) {
+ ++nonZeroEntryCount;
+ rowHadDiagonalEntry = true;
+ }
+ for (int_fast64_t skippedRow = lastRow + 1; skippedRow < row; ++skippedRow) {
+ ++nonZeroEntryCount;
+ }
+ lastRow = row;
+ rowHadDiagonalEntry = false;
+ }
+
+ if (col == row) {
+ rowHadDiagonalEntry = true;
+ } else if (col > row && !rowHadDiagonalEntry) {
+ rowHadDiagonalEntry = true;
+ ++nonZeroEntryCount;
+ }
+
+ /*
+ * Check if one is larger than the current maximum id.
+ */
+ if (row > maxnode) maxnode = row;
+ if (col > maxnode) maxnode = col;
+
+ /*
+ * Read probability of this transition.
+ * Check, if the value is a probability, i.e. if it is between 0 and 1.
+ */
+ val = checked_strtod(buf, &buf);
+ if ((val < 0.0) || (val > 1.0)) {
+ LOG4CPLUS_ERROR(logger, "Expected a positive probability but got \"" << val << "\".");
+ return 0;
+ }
+ ++nonZeroEntryCount;
+ ++readTransitionCount;
+ buf = trimWhitespaces(buf);
+ }
+
+ if (!rowHadDiagonalEntry) {
+ ++nonZeroEntryCount;
+ }
+
+ if (inputFileNonZeroEntryCount != readTransitionCount) {
+ LOG4CPLUS_ERROR(logger, "Input File TRANSITIONS line stated " << inputFileNonZeroEntryCount << " but there were " << readTransitionCount << " transitions afterwards.");
+ return 0;
}
- return non_zero;
+ return nonZeroEntryCount;
}
@@ -116,7 +141,7 @@ uint_fast64_t DeterministicSparseTransitionParser::firstPass(char* buf, int_fast
* @return a pointer to the created sparse matrix.
*/
-DeterministicSparseTransitionParser::DeterministicSparseTransitionParser(std::string const &filename)
+DeterministicSparseTransitionParser::DeterministicSparseTransitionParser(std::string const &filename, bool insertDiagonalEntriesIfMissing)
: matrix(nullptr) {
/*
* Enforce locale where decimal point is '.'.
@@ -132,12 +157,15 @@ DeterministicSparseTransitionParser::DeterministicSparseTransitionParser(std::st
/*
* Perform first pass, i.e. count entries that are not zero.
*/
- int_fast64_t maxnode;
- uint_fast64_t non_zero = this->firstPass(file.data, maxnode);
+ int_fast64_t maxStateId;
+ uint_fast64_t nonZeroEntryCount = this->firstPass(file.data, maxStateId);
+
+ LOG4CPLUS_INFO(logger, "First pass on " << filename << " shows " << nonZeroEntryCount << " NonZeros.");
+
/*
* If first pass returned zero, the file format was wrong.
*/
- if (non_zero == 0) {
+ if (nonZeroEntryCount == 0) {
LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": erroneous file format.");
throw storm::exceptions::WrongFileFormatException();
}
@@ -162,21 +190,22 @@ DeterministicSparseTransitionParser::DeterministicSparseTransitionParser(std::st
* Creating matrix here.
* The number of non-zero elements is computed by firstPass().
*/
- LOG4CPLUS_INFO(logger, "Attempting to create matrix of size " << (maxnode+1) << " x " << (maxnode+1) << ".");
- this->matrix = std::shared_ptr<storm::storage::SparseMatrix<double>>(new storm::storage::SparseMatrix<double>(maxnode + 1));
- if (this->matrix == NULL) {
- LOG4CPLUS_ERROR(logger, "Could not create matrix of size " << (maxnode+1) << " x " << (maxnode+1) << ".");
+ LOG4CPLUS_INFO(logger, "Attempting to create matrix of size " << (maxStateId+1) << " x " << (maxStateId+1) << ".");
+ this->matrix = std::shared_ptr<storm::storage::SparseMatrix<double>>(new storm::storage::SparseMatrix<double>(maxStateId + 1));
+ if (this->matrix == nullptr) {
+ LOG4CPLUS_ERROR(logger, "Could not create matrix of size " << (maxStateId+1) << " x " << (maxStateId+1) << ".");
throw std::bad_alloc();
}
- this->matrix->initialize(non_zero);
+ this->matrix->initialize(nonZeroEntryCount);
- int_fast64_t row, lastrow = -1, col;
+ int_fast64_t row, lastRow = -1, col;
double val;
bool fixDeadlocks = storm::settings::instance()->isSet("fix-deadlocks");
bool hadDeadlocks = false;
+ bool rowHadDiagonalEntry = false;
/*
- * Read all transitions from file. Note that we assume, that the
+ * Read all transitions from file. Note that we assume that the
* transitions are listed in canonical order, otherwise this will not
* work, i.e. the values in the matrix will be at wrong places.
*/
@@ -188,24 +217,57 @@ DeterministicSparseTransitionParser::DeterministicSparseTransitionParser(std::st
col = checked_strtol(buf, &buf);
val = checked_strtod(buf, &buf);
- /*
- * Check if we skipped a node, i.e. if a node does not have any
- * outgoing transitions.
- */
- for (int_fast64_t node = lastrow + 1; node < row; node++) {
- hadDeadlocks = true;
- if (fixDeadlocks) {
- this->matrix->addNextValue(node, node, 1);
- LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": node " << node << " has no outgoing transitions. A self-loop was inserted.");
+ if (lastRow != row) {
+ if ((lastRow != -1) && (!rowHadDiagonalEntry)) {
+ if (insertDiagonalEntriesIfMissing) {
+ this->matrix->addNextValue(lastRow, lastRow, storm::utility::constGetZero<double>());
+ LOG4CPLUS_DEBUG(logger, "While parsing " << filename << ": state " << lastRow << " has no transition to itself. Inserted a 0-transition. (1)");
+ } else {
+ LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": state " << lastRow << " has no transition to itself.");
+ }
+ // No increment for lastRow
+ rowHadDiagonalEntry = true;
+ }
+ for (int_fast64_t skippedRow = lastRow + 1; skippedRow < row; ++skippedRow) {
+ hadDeadlocks = true;
+ if (fixDeadlocks) {
+ this->matrix->addNextValue(skippedRow, skippedRow, storm::utility::constGetOne<double>());
+ rowHadDiagonalEntry = true;
+ LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": state " << skippedRow << " has no outgoing transitions. A self-loop was inserted.");
+ } else {
+ LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": state " << skippedRow << " has no outgoing transitions.");
+ // FIXME Why no exception at this point? This will break the App.
+ }
+ }
+ lastRow = row;
+ rowHadDiagonalEntry = false;
+ }
+
+ if (col == row) {
+ rowHadDiagonalEntry = true;
+ } else if (col > row && !rowHadDiagonalEntry) {
+ rowHadDiagonalEntry = true;
+ if (insertDiagonalEntriesIfMissing) {
+ this->matrix->addNextValue(row, row, storm::utility::constGetZero<double>());
+ LOG4CPLUS_DEBUG(logger, "While parsing " << filename << ": state " << row << " has no transition to itself. Inserted a 0-transition. (2)");
} else {
- LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": node " << node << " has no outgoing transitions.");
+ LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": state " << row << " has no transition to itself.");
}
}
- lastrow = row;
this->matrix->addNextValue(row, col, val);
buf = trimWhitespaces(buf);
}
+
+ if (!rowHadDiagonalEntry) {
+ if (insertDiagonalEntriesIfMissing) {
+ this->matrix->addNextValue(lastRow, lastRow, storm::utility::constGetZero<double>());
+ LOG4CPLUS_DEBUG(logger, "While parsing " << filename << ": state " << lastRow << " has no transition to itself. Inserted a 0-transition. (3)");
+ } else {
+ LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": state " << lastRow << " has no transition to itself.");
+ }
+ }
+
if (!fixDeadlocks && hadDeadlocks) throw storm::exceptions::WrongFileFormatException() << "Some of the nodes had deadlocks. You can use --fix-deadlocks to insert self-loops on the fly.";
/*
diff --git a/src/parser/DeterministicSparseTransitionParser.h b/src/parser/DeterministicSparseTransitionParser.h
index 099d0fa4a..2407f3398 100644
--- a/src/parser/DeterministicSparseTransitionParser.h
+++ b/src/parser/DeterministicSparseTransitionParser.h
@@ -17,7 +17,7 @@ namespace parser {
*/
class DeterministicSparseTransitionParser : public Parser {
public:
- DeterministicSparseTransitionParser(std::string const &filename);
+ DeterministicSparseTransitionParser(std::string const &filename, bool insertDiagonalEntriesIfMissing = true);
std::shared_ptr<storm::storage::SparseMatrix<double>> getMatrix() {
return this->matrix;
diff --git a/src/parser/MdpParser.cpp b/src/parser/MdpParser.cpp
index f73c0b515..ac73b4e40 100644
--- a/src/parser/MdpParser.cpp
+++ b/src/parser/MdpParser.cpp
@@ -45,7 +45,7 @@ MdpParser::MdpParser(std::string const & transitionSystemFile, std::string const
transitionRewards = trp.getMatrix();
}
- mdp = std::shared_ptr<storm::models::Mdp<double>>(new storm::models::Mdp<double>(tp.getMatrix(), lp.getLabeling(), stateRewards, transitionRewards));
+ mdp = std::shared_ptr<storm::models::Mdp<double>>(new storm::models::Mdp<double>(tp.getMatrix(), lp.getLabeling(), tp.getRowMapping(), stateRewards, transitionRewards));
}
} /* namespace parser */
diff --git a/src/parser/NonDeterministicSparseTransitionParser.cpp b/src/parser/NonDeterministicSparseTransitionParser.cpp
index 1eb270739..f6b70e719 100644
--- a/src/parser/NonDeterministicSparseTransitionParser.cpp
+++ b/src/parser/NonDeterministicSparseTransitionParser.cpp
@@ -214,7 +214,7 @@ NonDeterministicSparseTransitionParser::NonDeterministicSparseTransitionParser(s
/*
* Create row mapping.
*/
- this->rowMapping = std::shared_ptr<RowMapping>(new RowMapping());
+ this->rowMapping = std::shared_ptr<std::vector<uint_fast64_t>>(new std::vector<uint_fast64_t>(maxnode+1,0));
/*
* Parse file content.
@@ -245,7 +245,7 @@ NonDeterministicSparseTransitionParser::NonDeterministicSparseTransitionParser(s
for (int_fast64_t node = lastsource + 1; node < source; node++) {
hadDeadlocks = true;
if (fixDeadlocks) {
- this->rowMapping->insert(RowMapping::value_type(curRow, std::pair<uint_fast64_t, std::string>(node, "")));
+ this->rowMapping->at(node) = curRow;
this->matrix->addNextValue(curRow, node, 1);
curRow++;
LOG4CPLUS_WARN(logger, "Warning while parsing " << filename << ": node " << node << " has no outgoing transitions. A self-loop was inserted.");
@@ -253,13 +253,14 @@ NonDeterministicSparseTransitionParser::NonDeterministicSparseTransitionParser(s
LOG4CPLUS_ERROR(logger, "Error while parsing " << filename << ": node " << node << " has no outgoing transitions.");
}
}
+ if (source != lastsource) {
+ /*
+ * Add this source to rowMapping, if this is the first choice we encounter for this state.
+ */
+ this->rowMapping->at(source) = curRow;
+ }
lastsource = source;
- /*
- * Add this source-choice pair to rowMapping.
- */
- this->rowMapping->insert(RowMapping::value_type(curRow, std::pair<uint_fast64_t, std::string>(source, choice)));
-
/*
* Skip name of choice.
*/
diff --git a/src/parser/NonDeterministicSparseTransitionParser.h b/src/parser/NonDeterministicSparseTransitionParser.h
index 592e2814f..a0d9ea50a 100644
--- a/src/parser/NonDeterministicSparseTransitionParser.h
+++ b/src/parser/NonDeterministicSparseTransitionParser.h
@@ -6,7 +6,6 @@
#include "src/parser/Parser.h"
#include "src/utility/OsDetection.h"
-#include <boost/bimap.hpp>
#include <utility>
#include <memory>
#include <vector>
@@ -26,14 +25,13 @@ class NonDeterministicSparseTransitionParser : public Parser {
return this->matrix;
}
- typedef boost::bimap<uint_fast64_t, std::pair<uint_fast64_t,std::string>> RowMapping;
- inline std::shared_ptr<RowMapping> getRowMapping() const {
+ inline std::shared_ptr<std::vector<uint_fast64_t>> getRowMapping() const {
return this->rowMapping;
}
private:
std::shared_ptr<storm::storage::SparseMatrix<double>> matrix;
- std::shared_ptr<RowMapping> rowMapping;
+ std::shared_ptr<std::vector<uint_fast64_t>> rowMapping;
uint_fast64_t firstPass(char* buf, uint_fast64_t& choices, int_fast64_t& maxnode);
diff --git a/src/parser/PrctlParser.cpp b/src/parser/PrctlParser.cpp
index b4af33b0b..6b4a78c99 100644
--- a/src/parser/PrctlParser.cpp
+++ b/src/parser/PrctlParser.cpp
@@ -18,18 +18,21 @@
#include <fstream>
#include <iomanip>
+
// Some typedefs and namespace definitions to reduce code size.
typedef std::string::const_iterator BaseIteratorType;
typedef boost::spirit::classic::position_iterator2<BaseIteratorType> PositionIteratorType;
namespace qi = boost::spirit::qi;
namespace phoenix = boost::phoenix;
+
+
namespace storm {
namespace parser {
template<typename Iterator, typename Skipper>
-struct PrctlParser::PrctlGrammar : qi::grammar<Iterator, storm::formula::PctlFormula<double>*(), Skipper> {
+struct PrctlParser::PrctlGrammar : qi::grammar<Iterator, storm::formula::AbstractFormula<double>*(), Skipper> {
PrctlGrammar() : PrctlGrammar::base_type(start) {
freeIdentifierName = qi::lexeme[(qi::alpha | qi::char_('_'))];
@@ -86,28 +89,29 @@ struct PrctlParser::PrctlGrammar : qi::grammar<Iterator, storm::formula::PctlFor
phoenix::new_<storm::formula::BoundedUntil<double>>(qi::_1, qi::_3, qi::_2)];
start = (noBoundOperator | stateFormula);
+
}
- qi::rule<Iterator, storm::formula::PctlFormula<double>*(), Skipper> start;
+ qi::rule<Iterator, storm::formula::AbstractFormula<double>*(), Skipper> start;
- qi::rule<Iterator, storm::formula::PctlStateFormula<double>*(), Skipper> stateFormula;
+ qi::rule<Iterator, storm::formula::AbstractStateFormula<double>*(), Skipper> stateFormula;
qi::rule<Iterator, storm::formula::And<double>*(), Skipper> andFormula;
qi::rule<Iterator, storm::formula::Ap<double>*(), Skipper> atomicProposition;
- qi::rule<Iterator, storm::formula::PctlStateFormula<double>*(), Skipper> orFormula;
- qi::rule<Iterator, storm::formula::PctlStateFormula<double>*(), Skipper> notFormula;
- qi::rule<Iterator, storm::formula::PctlStateFormula<double>*(), Skipper> probabilisticBoundOperator;
- qi::rule<Iterator, storm::formula::PctlStateFormula<double>*(), Skipper> rewardBoundOperator;
+ qi::rule<Iterator, storm::formula::Or<double>*(), Skipper> orFormula;
+ qi::rule<Iterator, storm::formula::Not<double>*(), Skipper> notFormula;
+ qi::rule<Iterator, storm::formula::ProbabilisticBoundOperator<double>*(), Skipper> probabilisticBoundOperator;
+ qi::rule<Iterator, storm::formula::RewardBoundOperator<double>*(), Skipper> rewardBoundOperator;
qi::rule<Iterator, storm::formula::NoBoundOperator<double>*(), Skipper> noBoundOperator;
qi::rule<Iterator, storm::formula::NoBoundOperator<double>*(), Skipper> probabilisticNoBoundOperator;
qi::rule<Iterator, storm::formula::NoBoundOperator<double>*(), Skipper> rewardNoBoundOperator;
- qi::rule<Iterator, storm::formula::PctlPathFormula<double>*(), Skipper> pathFormula;
- qi::rule<Iterator, storm::formula::PctlPathFormula<double>*(), Skipper> boundedEventually;
- qi::rule<Iterator, storm::formula::PctlPathFormula<double>*(), Skipper> eventually;
- qi::rule<Iterator, storm::formula::PctlPathFormula<double>*(), Skipper> globally;
- qi::rule<Iterator, storm::formula::PctlPathFormula<double>*(), Skipper> boundedUntil;
- qi::rule<Iterator, storm::formula::PctlPathFormula<double>*(), Skipper> until;
+ qi::rule<Iterator, storm::formula::AbstractPathFormula<double>*(), Skipper> pathFormula;
+ qi::rule<Iterator, storm::formula::BoundedEventually<double>*(), Skipper> boundedEventually;
+ qi::rule<Iterator, storm::formula::Eventually<double>*(), Skipper> eventually;
+ qi::rule<Iterator, storm::formula::Globally<double>*(), Skipper> globally;
+ qi::rule<Iterator, storm::formula::BoundedUntil<double>*(), Skipper> boundedUntil;
+ qi::rule<Iterator, storm::formula::Until<double>*(), Skipper> until;
qi::rule<Iterator, std::string(), Skipper> freeIdentifierName;
@@ -133,7 +137,7 @@ storm::parser::PrctlParser::PrctlParser(std::string filename) {
// Prepare resulting intermediate representation of input.
- storm::formula::PctlFormula<double>* result_pointer = nullptr;
+ storm::formula::AbstractFormula<double>* result_pointer = nullptr;
PrctlGrammar<PositionIteratorType, BOOST_TYPEOF(boost::spirit::ascii::space)> grammar;
diff --git a/src/parser/PrctlParser.h b/src/parser/PrctlParser.h
index 595946730..f9f34cb63 100644
--- a/src/parser/PrctlParser.h
+++ b/src/parser/PrctlParser.h
@@ -20,15 +20,17 @@ class PrctlParser : Parser
/*!
* @brief return formula object parsed from file.
*/
- storm::formula::PctlFormula<double>* getFormula()
+ storm::formula::AbstractFormula<double>* getFormula()
{
return this->formula;
}
private:
- storm::formula::PctlFormula<double>* formula;
+ storm::formula::AbstractFormula<double>* formula;
+
template<typename Iterator, typename Skipper>
struct PrctlGrammar;
+
};
} // namespace parser
diff --git a/src/storage/BitVector.h b/src/storage/BitVector.h
index 66baf546e..df3f86600 100644
--- a/src/storage/BitVector.h
+++ b/src/storage/BitVector.h
@@ -387,11 +387,11 @@ public:
* Returns the number of bits that are set (to one) in this bit vector.
* @return The number of bits that are set (to one) in this bit vector.
*/
- uint_fast64_t getNumberOfSetBits() {
+ uint_fast64_t getNumberOfSetBits() const {
return getNumberOfSetBitsBeforeIndex(bucketCount << 6);
}
- uint_fast64_t getNumberOfSetBitsBeforeIndex(uint_fast64_t index) {
+ uint_fast64_t getNumberOfSetBitsBeforeIndex(uint_fast64_t index) const {
uint_fast64_t result = 0;
// First, count all full buckets.
uint_fast64_t bucket = index >> 6;
@@ -437,7 +437,7 @@ public:
/*!
* Retrieves the number of bits this bit vector can store.
*/
- uint_fast64_t getSize() {
+ uint_fast64_t getSize() const {
return bitCount;
}
@@ -445,7 +445,7 @@ public:
* Returns the size of the bit vector in memory measured in bytes.
* @return The size of the bit vector in memory measured in bytes.
*/
- uint_fast64_t getSizeInMemory() {
+ uint_fast64_t getSizeInMemory() const {
return sizeof(*this) + sizeof(uint_fast64_t) * bucketCount;
}
@@ -463,6 +463,20 @@ public:
return endIterator;
}
+ /*!
+ * Returns a string representation of the bit vector.
+ */
+ std::string toString() const {
+ std::stringstream result;
+ result << "bit vector(" << this->getNumberOfSetBits() << ") [";
+ for (auto index : *this) {
+ result << index << " ";
+ }
+ result << "]";
+
+ return result.str();
+ }
+
private:
/*!
diff --git a/src/storage/JacobiDecomposition.h b/src/storage/JacobiDecomposition.h
index f6de68e98..9aec6f061 100644
--- a/src/storage/JacobiDecomposition.h
+++ b/src/storage/JacobiDecomposition.h
@@ -6,6 +6,8 @@
#include "log4cplus/logger.h"
#include "log4cplus/loggingmacros.h"
+#include "src/exceptions/InvalidAccessException.h"
+
extern log4cplus::Logger logger;
namespace storm {
@@ -76,7 +78,9 @@ private:
* The copy constructor is disabled for this class.
*/
//JacobiDecomposition(const JacobiDecomposition<T>& that) = delete; // not possible in VS2012
- JacobiDecomposition(const JacobiDecomposition<T>& that) {}
+ JacobiDecomposition(const JacobiDecomposition<T>& that) {
+ throw storm::exceptions::InvalidAccessException() << "The copy constructor of JacobiDecomposition is explicitly disabled.";
+ }
/*!
* Pointer to the LU Matrix
diff --git a/src/storage/SparseMatrix.h b/src/storage/SparseMatrix.h
index 308917481..943656e95 100644
--- a/src/storage/SparseMatrix.h
+++ b/src/storage/SparseMatrix.h
@@ -25,10 +25,11 @@
extern log4cplus::Logger logger;
// Forward declaration for adapter classes.
-namespace storm {
-namespace adapters{
-class GmmxxAdapter;
-}
+namespace storm {
+ namespace adapters{
+ class GmmxxAdapter;
+ class EigenAdapter;
+ }
}
namespace storm {
@@ -46,6 +47,7 @@ public:
* Declare adapter classes as friends to use internal data.
*/
friend class storm::adapters::GmmxxAdapter;
+ friend class storm::adapters::EigenAdapter;
/*!
* If we only want to iterate over the columns of the non-zero entries of
@@ -798,22 +800,29 @@ public:
/*!
* Inverts all elements on the diagonal, i.e. sets the diagonal values to 1 minus their previous
* value.
+ * Requires the matrix to contain each diagonal element AND to be square!
*/
void invertDiagonal() {
if (this->getRowCount() != this->getColumnCount()) {
throw storm::exceptions::InvalidArgumentException() << "SparseMatrix::invertDiagonal requires the Matrix to be square!";
}
- T one(1);
+ T one = storm::utility::constGetOne<T>();
+ bool foundRow;
for (uint_fast64_t row = 0; row < rowCount; ++row) {
uint_fast64_t rowStart = rowIndications[row];
uint_fast64_t rowEnd = rowIndications[row + 1];
+ foundRow = false;
while (rowStart < rowEnd) {
if (columnIndications[rowStart] == row) {
valueStorage[rowStart] = one - valueStorage[rowStart];
+ foundRow = true;
break;
}
++rowStart;
}
+ if (!foundRow) {
+ throw storm::exceptions::InvalidArgumentException() << "SparseMatrix::invertDiagonal requires the Matrix to contain all diagonal entries!";
+ }
}
}
@@ -846,9 +855,13 @@ public:
SparseMatrix<T> *resultDinv = new SparseMatrix<T>(rowCount);
// no entries apart from those on the diagonal
resultDinv->initialize(0);
+
+ // constant 1 for diagonal inversion
+ T constOne = storm::utility::constGetOne<T>();
+
// copy diagonal entries to other matrix
for (int i = 0; i < rowCount; ++i) {
- resultDinv->addNextValue(i, i, resultLU->getValue(i, i));
+ resultDinv->addNextValue(i, i, constOne / resultLU->getValue(i, i));
resultLU->getValue(i, i) = storm::utility::constGetZero<T>();
}
diff --git a/src/storm.cpp b/src/storm.cpp
index 250163f70..9d2fff6d7 100644
--- a/src/storm.cpp
+++ b/src/storm.cpp
@@ -216,12 +216,12 @@ void testChecking() {
if (parser.getType() == storm::models::DTMC) {
std::shared_ptr<storm::models::Dtmc<double>> dtmc = parser.getModel<storm::models::Dtmc<double>>();
dtmc->printModelInformationToStream(std::cout);
+
+ // testCheckingDie(*dtmc);
+ // testCheckingCrowds(*dtmc);
+ // testCheckingSynchronousLeader(*dtmc, 4);
}
else std::cout << "Input is not DTMC" << std::endl;
-
- // testCheckingDie(*dtmc);
- // testCheckingCrowds(*dtmc);
- // testCheckingSynchronousLeader(*dtmc, 4);
}
/*!
diff --git a/test/eigen/EigenAdapterTest.cpp b/test/eigen/EigenAdapterTest.cpp
new file mode 100644
index 000000000..bddb74dd7
--- /dev/null
+++ b/test/eigen/EigenAdapterTest.cpp
@@ -0,0 +1,96 @@
+#include "gtest/gtest.h"
+
+#include "Eigen/Sparse"
+#include "src/adapters/EigenAdapter.h"
+#include "src/exceptions/InvalidArgumentException.h"
+#include "boost/integer/integer_mask.hpp"
+
+#define STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE 5
+#define STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE 5
+
+TEST(EigenAdapterTest, SimpleDenseSquareCopy) {
+ // 5 rows
+ storm::storage::SparseMatrix<double> sm(STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE);
+
+ double values[STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE];
+ sm.initialize(STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE);
+
+ int row = 0;
+ int col = 0;
+ for (int i = 0; i < STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE; ++i) {
+ values[i] = static_cast<double>(i + 1);
+
+ sm.addNextValue(row, col, values[i]);
+ ++col;
+ if (col == STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE) {
+ ++row;
+ col = 0;
+ }
+ }
+ sm.finalize();
+
+ auto esm = storm::adapters::EigenAdapter::toEigenSparseMatrix(sm);
+
+ ASSERT_EQ(esm->rows(), STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE);
+ ASSERT_EQ(esm->cols(), STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE);
+ ASSERT_EQ(esm->nonZeros(), STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE);
+
+ row = 0;
+ col = 0;
+ for (int i = 0; i < STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE; ++i) {
+ ASSERT_EQ(values[i], esm->coeff(row, col));
+ ++col;
+ if (col == STORM_EIGENADAPTERTEST_SIMPLEDENSESQUARECOPY_SIZE) {
+ ++row;
+ col = 0;
+ }
+ }
+}
+
+TEST(EigenAdapterTest, SimpleSparseSquareCopy) {
+ // 5 rows
+ storm::storage::SparseMatrix<double> sm(STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE);
+
+ double values[STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE];
+ sm.initialize((STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE + 1) / 2);
+
+ int row = 0;
+ int col = 0;
+
+ bool everySecondElement = true;
+
+ for (int i = 0; i < STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE; ++i) {
+ values[i] = static_cast<double>(i + 1);
+ if (everySecondElement) {
+ sm.addNextValue(row, col, values[i]);
+ }
+ everySecondElement = !everySecondElement;
+ ++col;
+ if (col == STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE) {
+ ++row;
+ col = 0;
+ }
+ }
+ sm.finalize();
+
+ auto esm = storm::adapters::EigenAdapter::toEigenSparseMatrix(sm);
+
+ ASSERT_EQ(esm->rows(), STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE);
+ ASSERT_EQ(esm->cols(), STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE);
+ ASSERT_EQ(esm->nonZeros(), (STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE + 1) / 2);
+
+ row = 0;
+ col = 0;
+ everySecondElement = true;
+ for (int i = 0; i < STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE * STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE; ++i) {
+ if (everySecondElement) {
+ ASSERT_EQ(values[i], esm->coeff(row, col));
+ }
+ everySecondElement = !everySecondElement;
+ ++col;
+ if (col == STORM_EIGENADAPTERTEST_SIMPLESPARSESQUARECOPY_SIZE) {
+ ++row;
+ col = 0;
+ }
+ }
+}
diff --git a/test/parser/ParseDtmcTest.cpp b/test/parser/ParseDtmcTest.cpp
index f5bd8f163..d99c16f74 100644
--- a/test/parser/ParseDtmcTest.cpp
+++ b/test/parser/ParseDtmcTest.cpp
@@ -12,7 +12,7 @@
#include "src/utility/IoUtility.h"
TEST(ParseDtmcTest, parseAndOutput) {
- storm::parser::DeterministicModelParser* dtmcParser;
+ storm::parser::DeterministicModelParser* dtmcParser = nullptr;
ASSERT_NO_THROW(dtmcParser = new storm::parser::DeterministicModelParser(
STORM_CPP_TESTS_BASE_PATH "/parser/tra_files/pctl_general_input_01.tra",
STORM_CPP_TESTS_BASE_PATH "/parser/lab_files/pctl_general_input_01.lab"));
diff --git a/test/parser/ParseMdpTest.cpp b/test/parser/ParseMdpTest.cpp
index 4147c0122..cfa50f1c7 100644
--- a/test/parser/ParseMdpTest.cpp
+++ b/test/parser/ParseMdpTest.cpp
@@ -12,7 +12,7 @@
#include "src/utility/IoUtility.h"
TEST(ParseMdpTest, parseAndOutput) {
- storm::parser::MdpParser* mdpParser;
+ storm::parser::MdpParser* mdpParser = nullptr;
ASSERT_NO_THROW(mdpParser = new storm::parser::MdpParser(
STORM_CPP_TESTS_BASE_PATH "/parser/tra_files/mdp_general_input_01.tra",
STORM_CPP_TESTS_BASE_PATH "/parser/lab_files/pctl_general_input_01.lab"));
diff --git a/test/parser/ReadLabFileTest.cpp b/test/parser/ReadLabFileTest.cpp
index e7e2df029..9b1d72241 100644
--- a/test/parser/ReadLabFileTest.cpp
+++ b/test/parser/ReadLabFileTest.cpp
@@ -23,7 +23,7 @@ TEST(ReadLabFileTest, ParseTest) {
//This test is based on a test case from the original MRMC.
- storm::parser::AtomicPropositionLabelingParser* parser;
+ storm::parser::AtomicPropositionLabelingParser* parser = nullptr;
//Parsing the file
ASSERT_NO_THROW(parser = new storm::parser::AtomicPropositionLabelingParser(12, STORM_CPP_TESTS_BASE_PATH "/parser/lab_files/pctl_general_input_01.lab"));
std::shared_ptr<storm::models::AtomicPropositionsLabeling> labeling(parser->getLabeling());
@@ -32,7 +32,7 @@ TEST(ReadLabFileTest, ParseTest) {
char phi[] = "phi", psi[] = "psi", smth[] = "smth";
- if (labeling != NULL) {
+ if (labeling != nullptr) {
ASSERT_TRUE(labeling->containsAtomicProposition(phi));
ASSERT_TRUE(labeling->containsAtomicProposition(psi));
ASSERT_TRUE(labeling->containsAtomicProposition(smth));
diff --git a/test/parser/ReadTraFileTest.cpp b/test/parser/ReadTraFileTest.cpp
index 2bda7561e..6a697536d 100644
--- a/test/parser/ReadTraFileTest.cpp
+++ b/test/parser/ReadTraFileTest.cpp
@@ -22,45 +22,51 @@ TEST(ReadTraFileTest, NonExistingFileTest) {
/* The following test case is based on one of the original STORM test cases
*/
TEST(ReadTraFileTest, ParseFileTest1) {
- storm::parser::DeterministicSparseTransitionParser* parser;
+ storm::parser::DeterministicSparseTransitionParser* parser = nullptr;
ASSERT_NO_THROW(parser = new storm::parser::DeterministicSparseTransitionParser(STORM_CPP_TESTS_BASE_PATH "/parser/tra_files/csl_general_input_01.tra"));
std::shared_ptr<storm::storage::SparseMatrix<double>> result = parser->getMatrix();
- if (result != NULL) {
+ if (result != nullptr) {
double val = 0;
- ASSERT_TRUE(result->getValue(1,1,&val));
- ASSERT_EQ(val,0.080645161290322580645161290322581);
+ ASSERT_TRUE(result->getValue(0, 0, &val));
+ ASSERT_EQ(val, 0.0);
- ASSERT_TRUE(result->getValue(1,2,&val));
- ASSERT_EQ(val,0.080645161290322580645161290322581);
+ ASSERT_TRUE(result->getValue(0, 1, &val));
+ ASSERT_EQ(val, 1.0);
+
+ ASSERT_TRUE(result->getValue(1, 1, &val));
+ ASSERT_EQ(val, 0.080645161290322580645161290322581);
+
+ ASSERT_TRUE(result->getValue(1, 2, &val));
+ ASSERT_EQ(val, 0.080645161290322580645161290322581);
//Transition 1->3 was not set in the file, so it is not to appear in the matrix!
- ASSERT_FALSE(result->getValue(1,3,&val));
- ASSERT_EQ(val,0);
+ ASSERT_FALSE(result->getValue(1, 3, &val));
+ ASSERT_EQ(val, 0);
- ASSERT_TRUE(result->getValue(2,1,&val));
- ASSERT_EQ(val,0.04032258064516129032258064516129);
+ ASSERT_TRUE(result->getValue(2, 1, &val));
+ ASSERT_EQ(val, 0.04032258064516129032258064516129);
- ASSERT_TRUE(result->getValue(2,2,&val));
- ASSERT_EQ(val,0.04032258064516129032258064516129);
+ ASSERT_TRUE(result->getValue(2, 2, &val));
+ ASSERT_EQ(val, 0.04032258064516129032258064516129);
- ASSERT_TRUE(result->getValue(2,3,&val));
- ASSERT_EQ(val,0.04032258064516129032258064516129);
+ ASSERT_TRUE(result->getValue(2, 3, &val));
+ ASSERT_EQ(val, 0.04032258064516129032258064516129);
- ASSERT_TRUE(result->getValue(2,4,&val));
- ASSERT_EQ(val,0.04032258064516129032258064516129);
+ ASSERT_TRUE(result->getValue(2, 4, &val));
+ ASSERT_EQ(val, 0.04032258064516129032258064516129);
- ASSERT_TRUE(result->getValue(3,2,&val));
- ASSERT_EQ(val,0.0806451612903225806451612903225812);
+ ASSERT_TRUE(result->getValue(3, 2, &val));
+ ASSERT_EQ(val, 0.0806451612903225806451612903225812);
- ASSERT_FALSE(result->getValue(3,3,&val));
- ASSERT_EQ(val,0);
+ ASSERT_TRUE(result->getValue(3, 3, &val));
+ ASSERT_EQ(val, 0.0);
- ASSERT_TRUE(result->getValue(3,4,&val));
- ASSERT_EQ(val,0.080645161290322580645161290322581);
+ ASSERT_TRUE(result->getValue(3, 4, &val));
+ ASSERT_EQ(val, 0.080645161290322580645161290322581);
- ASSERT_FALSE(result->getValue(4,4,&val));
- ASSERT_EQ(val,0);
+ ASSERT_TRUE(result->getValue(4, 4, &val));
+ ASSERT_EQ(val, 0.0);
delete parser;
} else {
diff --git a/test/storage/SparseMatrixTest.cpp b/test/storage/SparseMatrixTest.cpp
index 2a29fb736..6a20050dd 100644
--- a/test/storage/SparseMatrixTest.cpp
+++ b/test/storage/SparseMatrixTest.cpp
@@ -2,6 +2,7 @@
#include "src/storage/SparseMatrix.h"
#include "src/exceptions/InvalidArgumentException.h"
#include "src/exceptions/OutOfRangeException.h"
+#include "src/adapters/EigenAdapter.h"
TEST(SparseMatrixTest, ZeroRowsTest) {
storm::storage::SparseMatrix<int> *ssm = new storm::storage::SparseMatrix<int>(0);
@@ -94,6 +95,10 @@ TEST(SparseMatrixTest, Test) {
2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23 /* second to last row */
};
+ int row_sums[25] = {};
+ for (int i = 0; i < 50; ++i) {
+ row_sums[position_row[i]] += values[i];
+ }
ASSERT_NO_THROW(ssm->initialize(50));
ASSERT_EQ(ssm->getState(), storm::storage::SparseMatrix<int>::MatrixStatus::Initialized);
@@ -123,6 +128,11 @@ TEST(SparseMatrixTest, Test) {
}
ASSERT_EQ(ssm->getState(), storm::storage::SparseMatrix<int>::MatrixStatus::ReadReady);
+ // Test Row Sums
+ for (int row = 0; row < 25; ++row) {
+ ASSERT_EQ(row_sums[row], ssm->getRowSum(row));
+ }
+
delete ssm;
}
@@ -313,7 +323,7 @@ TEST(SparseMatrixTest, ConversionToSparseEigen_RowMajor_SparseMatrixTest) {
ASSERT_NO_THROW(ssm->finalize());
ASSERT_EQ(ssm->getState(), storm::storage::SparseMatrix<int>::MatrixStatus::ReadReady);
- Eigen::SparseMatrix<int, Eigen::RowMajor, int_fast32_t>* esm = ssm->toEigenSparseMatrix();
+ Eigen::SparseMatrix<int, Eigen::RowMajor, int_fast32_t>* esm = storm::adapters::EigenAdapter::toEigenSparseMatrix<int>(*ssm);
for (uint_fast32_t row = 0; row < 10; ++row) {
for (uint_fast32_t col = 0; col < 10; ++col) {