diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2014-12-20 15:51:00 +0100 |
|---|---|---|
| committer | Andreas Stöckel <andreas@somweyr.de> | 2014-12-20 15:51:00 +0100 |
| commit | a7567d08e4d5869833069ec7211785af350aea88 (patch) | |
| tree | 120971129563f9e5f054ea5bb740fcbf8f473936 /CMakeLists.txt | |
| parent | 87233da76c01ebead18a26f01ffb4e20dffe3214 (diff) | |
Renamed ManagedType class to Rtti to make naming less confusing, implemented easier to use Rtti clas
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cc06d6..371ffca 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,12 +32,17 @@ OPTION(BUILD_DOCUMENTATION "Create and install the HTML based API documentation # Enable C++11 and all warnings SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic-errors -std=c++11") -# Include boost (filesystem) expat and mozjs-24 via PkgConfig +# Include expat and mozjs-24 via PkgConfig FIND_PACKAGE(PkgConfig REQUIRED) PKG_CHECK_MODULES(MOZJS REQUIRED mozjs-24) PKG_CHECK_MODULES(EXPAT REQUIRED expat) + +# Include required Boost components using the Boost cmake package FIND_PACKAGE(Boost COMPONENTS system filesystem REQUIRED) +# Set utf8cpp include path +SET(UTF8CPP_INCLUDE_DIR "lib/utf8") + ################################################################################ # Inclusion of doxygen # ################################################################################ @@ -87,6 +92,7 @@ INCLUDE_DIRECTORIES( ${MOZJS_INCLUDE_DIRS} ${EXPAT_INCLUDE_DIRS} ${Boost_INCLUDE_DIR} + ${UTF8CPP_INCLUDE_DIR} ) # Link directories @@ -112,8 +118,8 @@ ADD_LIBRARY(ousia_core src/core/common/Variant src/core/common/VariantReader src/core/managed/Managed - src/core/managed/ManagedType src/core/managed/Manager + src/core/managed/Rtti src/core/model/Document src/core/model/Domain src/core/model/Typesystem @@ -184,6 +190,7 @@ IF(TEST) test/core/managed/ManagedContainerTest test/core/managed/ManagedTest test/core/managed/ManagerTest + test/core/managed/RttiTest test/core/model/DomainTest test/core/model/DocumentTest test/core/model/TypesystemTest |