Преглед изворни кода

Added VTK to port, but not optional yet.

enhancement_3
Trevor Irons пре 8 година
родитељ
комит
1a6a0a4491
2 измењених фајлова са 16 додато и 5 уклоњено
  1. 15
    5
      CMakeLists.txt
  2. 1
    0
      LemmaCore/CMakeLists.txt

+ 15
- 5
CMakeLists.txt Прегледај датотеку

1
-cmake_minimum_required (VERSION 2.6)
1
+cmake_minimum_required (VERSION 2.8.7)
2
 
2
 
3
 project (Lemma)
3
 project (Lemma)
4
 
4
 
8
 include(ExternalProject)
8
 include(ExternalProject)
9
 
9
 
10
 # Eigen, this header-library is used extensively for linear algebra, matrices, and arrays
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
 ExternalProject_Add(EIGEN
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
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
22
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
17
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
23
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
18
 )
24
 )
55
 #####################
61
 #####################
56
 project(LEMMA_CXX)
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
 set(LEMMA_VERSION_MAJOR "0")
68
 set(LEMMA_VERSION_MAJOR "0")
59
 set(LEMMA_VERSION_MINOR "0")
69
 set(LEMMA_VERSION_MINOR "0")
60
 set(LEMMA_VERSION_PATCH "0")
70
 set(LEMMA_VERSION_PATCH "0")

+ 1
- 0
LemmaCore/CMakeLists.txt Прегледај датотеку

10
 add_dependencies(lemmacore TINYXML2)
10
 add_dependencies(lemmacore TINYXML2)
11
 add_dependencies(lemmacore MATIO)
11
 add_dependencies(lemmacore MATIO)
12
 
12
 
13
+target_link_libraries(lemmacore ${VTK_LIBRARIES})

Loading…
Откажи
Сачувај