diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-05-13 20:41:10 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-05-13 20:41:10 (GMT) |
| commit | f8e0c96fddfdd5f086e1bd973d6b0a19c39c93da (patch) | |
| tree | b0f5564f4f4b5cb743d402c656986fbfa586b1a2 /src | |
| parent | 3bf5ef5f882b9ff743deb3d821834e471354128a (diff) | |
| download | uscxml-f8e0c96fddfdd5f086e1bd973d6b0a19c39c93da.zip uscxml-f8e0c96fddfdd5f086e1bd973d6b0a19c39c93da.tar.gz uscxml-f8e0c96fddfdd5f086e1bd973d6b0a19c39c93da.tar.bz2 | |
Make install will work again
Diffstat (limited to 'src')
| -rw-r--r-- | src/uscxml/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/uscxml/CMakeLists.txt b/src/uscxml/CMakeLists.txt index 5549b84..3497b18 100644 --- a/src/uscxml/CMakeLists.txt +++ b/src/uscxml/CMakeLists.txt @@ -74,10 +74,10 @@ add_subdirectory(plugins/datamodel) add_subdirectory(plugins/invoker) add_subdirectory(plugins/ioprocessor) -# SET(USCXML_INVOKERS ${USCXML_INVOKERS} PARENT_SCOPE) -# SET(USCXML_IOPROCESSORS ${USCXML_IOPROCESSORS} PARENT_SCOPE) -# SET(USCXML_ELEMENTS ${USCXML_ELEMENTS} PARENT_SCOPE) -# SET(USCXML_DATAMODELS ${USCXML_DATAMODELS} PARENT_SCOPE) +SET(USCXML_INVOKERS ${USCXML_INVOKERS} PARENT_SCOPE) +SET(USCXML_IOPROCESSORS ${USCXML_IOPROCESSORS} PARENT_SCOPE) +SET(USCXML_ELEMENTS ${USCXML_ELEMENTS} PARENT_SCOPE) +SET(USCXML_DATAMODELS ${USCXML_DATAMODELS} PARENT_SCOPE) # SET(USCXML_LANGUAGE_BINDINGS ${USCXML_LANGUAGE_BINDINGS} PARENT_SCOPE) # # set(USCXML_INCLUDE_DIRS ${USCXML_INCLUDE_DIRS} PARENT_SCOPE) diff --git a/src/uscxml/plugins/datamodel/CMakeLists.txt b/src/uscxml/plugins/datamodel/CMakeLists.txt index b004a33..c597acc 100644 --- a/src/uscxml/plugins/datamodel/CMakeLists.txt +++ b/src/uscxml/plugins/datamodel/CMakeLists.txt @@ -47,8 +47,6 @@ if (LUA_FOUND) list (APPEND USCXML_OPT_LIBS ${LUA_LIBRARY}) endif() - -find_package(SWIG) if (NOT SWIG_FOUND) message(STATUS "No swig binary found, not generating DOM classes") elseif(SWIG_VERSION VERSION_LESS 3.0.8) |