Browse Source

config fix

master
Trevor Irons 6 years ago
parent
commit
fd515bd242
1 changed files with 2 additions and 3 deletions
  1. 2
    3
      CMakeLists.txt

+ 2
- 3
CMakeLists.txt View 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
 

Loading…
Cancel
Save