From df87d7fa13e998acd66921db43a1d0f0554ed07a Mon Sep 17 00:00:00 2001 From: sjunges Date: Tue, 20 Dec 2016 00:19:58 +0100 Subject: [PATCH] cleaned cmake list (removal of python related stuff), slightly altered doc (mainly just to improve further work on that --- CMakeLists.txt | 7 ------- doc/build.md | 6 ++++-- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7da6c745d..1ab7c6888 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,6 @@ option(USE_HYPRO "Sets whether HyPro should be included." OFF) option(XML_SUPPORT "Sets whether xml based format parsing should be included." ON) option(FORCE_COLOR "Force color output" OFF) mark_as_advanced(FORCE_COLOR) -option(STORM_PYTHON "Build the API for Python" OFF) option(STORM_COMPILE_WITH_CCACHE "Compile using CCache [if found]" ON) mark_as_advanced(STORM_COMPILE_WITH_CCACHE) option(STORM_LOG_DISABLE_DEBUG "Disable log and trace message support" OFF) @@ -132,11 +131,6 @@ endif() message(STATUS "Assuming extension for shared libraries: ${DYNAMIC_EXT}") message(STATUS "Assuming extension for static libraries: ${STATIC_EXT}") -# Python bindings need shared library -if(STORM_PYTHON) - set(BUILD_SHARED_LIBS ON CACHE BOOL "Build the Storm library dynamically" FORCE) -endif() - if(BUILD_SHARED_LIBS) set(LIB_EXT ${DYNAMIC_EXT}) message(STATUS "Build dynamic libraries.") @@ -365,7 +359,6 @@ set(CMAKE_CTEST_COMMAND_VERBOSE ${CMAKE_CTEST_COMMAND} -V) add_custom_target(check-verbose COMMAND ${CMAKE_CTEST_COMMAND_VERBOSE}) -# Python bindings for storm set(STORM_TARGETS "") add_subdirectory(src) diff --git a/doc/build.md b/doc/build.md index 703f6ca0f..725794034 100644 --- a/doc/build.md +++ b/doc/build.md @@ -23,9 +23,11 @@ Prerequisites: ## Instructions ### General - -> mkdir build +```bash +mkdir build +cd build +``` It is recommended to make an out-of-source build, meaning that the folder in which CMake generates its Cache, Makefiles and output files should not be the Project Root nor its Source Directory. A typical build layout is to create a folder "build" in the project root alongside the CMakeLists.txt file, change into this folder and execute "cmake .." as this will leave all source files untouched