T-bone 6 anni fa
parent
commit
c9d9d03383
2 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. 2
    3
      CMakeLists.txt
  2. 3
    0
      README.md

+ 2
- 3
CMakeLists.txt Vedi File

@@ -25,13 +25,12 @@ set_target_properties(merlin PROPERTIES
25 25
 target_link_libraries(merlin "lemmacore" "fdem1d" )
26 26
 
27 27
 # Linking
28
-if ( MERLIN_VTK6_SUPPORT OR MERLIN_VTK7_SUPPORT ) 
28
+if ( LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT ) 
29 29
 	target_link_libraries(merlin ${VTK_LIBRARIES})
30
-#	target_link_libraries(lemmacore "matplot")
31 30
 endif()
32 31
 
33 32
 # Testing
34
-if (MERLIN_ENABLE_TESTING)
33
+if (LEMMA_ENABLE_TESTING)
35 34
 	add_subdirectory(testing)
36 35
 endif()
37 36
 

+ 3
- 0
README.md Vedi File

@@ -1 +1,4 @@
1
+==About
1 2
 Merlin is a NMR modelling module for Lemma. 
3
+
4
+=Capabilities 

Loading…
Annulla
Salva