Просмотр исходного кода

Added VTK to port, but not optional yet.

enhancement_3
Trevor Irons 8 лет назад
Родитель
Сommit
1a6a0a4491
2 измененных файлов: 16 добавлений и 5 удалений
  1. 15
    5
      CMakeLists.txt
  2. 1
    0
      LemmaCore/CMakeLists.txt

+ 15
- 5
CMakeLists.txt Просмотреть файл

@@ -1,4 +1,4 @@
1
-cmake_minimum_required (VERSION 2.6)
1
+cmake_minimum_required (VERSION 2.8.7)
2 2
 
3 3
 project (Lemma)
4 4
 
@@ -8,11 +8,17 @@ project (Lemma)
8 8
 include(ExternalProject)
9 9
 
10 10
 # Eigen, this header-library is used extensively for linear algebra, matrices, and arrays
11
+# Mercurial (hg) repo pull, Would it be better to just download latest stable?
12
+#ExternalProject_Add(EIGEN
13
+#	HG_REPOSITORY  "https://bitbucket.org/eigen/eigen/"
14
+#	UPDATE_COMMAND ""
15
+#	PATCH_COMMAND ""
16
+#    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
17
+#    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
18
+#)
19
+# Stable Eigen, requires manual updating when new releases, but lighter weight.  
11 20
 ExternalProject_Add(EIGEN
12
-	HG_REPOSITORY  "https://bitbucket.org/eigen/eigen/"
13
-	#DOWNLOAD_COMMAND wget http://bitbucket.org/eigen/eigen/get/3.2.7.tar.bz2
14
-	UPDATE_COMMAND ""
15
-	PATCH_COMMAND ""
21
+	URL "http://bitbucket.org/eigen/eigen/get/3.2.7.tar.gz"
16 22
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
17 23
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
18 24
 )
@@ -55,6 +61,10 @@ ExternalProject_ADD(MATIO
55 61
 #####################
56 62
 project(LEMMA_CXX)
57 63
 
64
+# We don't Build VTK, it is too much. 
65
+find_package(VTK 6.0 REQUIRED NO_MODULE)
66
+include(${VTK_USE_FILE})
67
+
58 68
 set(LEMMA_VERSION_MAJOR "0")
59 69
 set(LEMMA_VERSION_MINOR "0")
60 70
 set(LEMMA_VERSION_PATCH "0")

+ 1
- 0
LemmaCore/CMakeLists.txt Просмотреть файл

@@ -10,3 +10,4 @@ add_dependencies(lemmacore YAML-CPP)
10 10
 add_dependencies(lemmacore TINYXML2)
11 11
 add_dependencies(lemmacore MATIO)
12 12
 
13
+target_link_libraries(lemmacore ${VTK_LIBRARIES})

Загрузка…
Отмена
Сохранить