Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / Model / CMakeLists.txt

diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt
index 48a70e9acdf6be457d8f1e9fb1c49110c516390b..24bee85be889d3455ad8ed342b4e6271a187f057 100644 (file)
--- a/src/Model/CMakeLists.txt
+++ b/src/Model/CMakeLists.txt
@@ -1,5 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
-
 INCLUDE(Common)
 INCLUDE(FindCAS)
 
@@ -16,23 +14,23 @@ SET(PROJECT_HEADERS
 )
 
 SET(PROJECT_SOURCES
-    Model_Application.cxx
-    Model_Document.cxx
-    Model_PluginManager.cxx
-    Model_Data.cxx
-    Model_Iterator.cxx
-    Model_AttributeDouble.cxx
-    Model_AttributeDocRef.cxx
-    Model_Events.cxx
+    Model_Application.cpp
+    Model_Document.cpp
+    Model_PluginManager.cpp
+    Model_Data.cpp
+    Model_Iterator.cpp
+    Model_AttributeDouble.cpp
+    Model_AttributeDocRef.cpp
+    Model_Events.cpp
 )
 
-ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS})
+ADD_DEFINITIONS(-DMODEL_EXPORTS ${CAS_DEFINITIONS} ${BOOST_DEFINITIONS})
 ADD_LIBRARY(Model SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
-TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES} ${CAS_OCAF} ModelAPI Event Config)
+TARGET_LINK_LIBRARIES(Model ${PROJECT_LIBRARIES} ${CAS_OCAF} ModelAPI Events Config)
 
 INCLUDE_DIRECTORIES(
   ../ModelAPI
-  ../Event
+  ../Events
   ../Config
   ${CAS_INCLUDE_DIRS}
 )