From 43d35a0f792bcb6b99e5f88296b39af38a04b511 Mon Sep 17 00:00:00 2001 From: sjunges Date: Fri, 2 Dec 2016 09:46:27 +0100 Subject: [PATCH] storm export config improved --- resources/cmake/stormConfig.cmake.in | 3 ++- src/storm/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/cmake/stormConfig.cmake.in b/resources/cmake/stormConfig.cmake.in index 890571311..99b7bfb91 100644 --- a/resources/cmake/stormConfig.cmake.in +++ b/resources/cmake/stormConfig.cmake.in @@ -1,5 +1,6 @@ set(storm_VERSION @storm_VERSION@) +get_filename_component(storm_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) @DEP_TARGETS@ @@ -7,7 +8,7 @@ set(storm_VERSION @storm_VERSION@) # Our library dependencies (contains definitions for IMPORTED targets) if(NOT TARGET storm) - include("${PROJECT_BINARY_DIR}/stormTargets.cmake") + include("${storm_CMAKE_DIR}/stormTargets.cmake") endif() @PACKAGE_INIT@ diff --git a/src/storm/CMakeLists.txt b/src/storm/CMakeLists.txt index 44bac6429..b5d77e243 100644 --- a/src/storm/CMakeLists.txt +++ b/src/storm/CMakeLists.txt @@ -40,7 +40,7 @@ add_library(storm SHARED ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) set_target_properties(storm PROPERTIES DEFINE_SYMBOL "") add_dependencies(storm resources) target_link_libraries(storm ${STORM_LINK_LIBRARIES}) -append(STORM_TARGETS storm CACHE STRING INTERNAL FORCE) +list(APPEND STORM_TARGETS storm CACHE STRING INTERNAL FORCE) # Create storm. add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS})