Merge branch 'master' of https://git.lemmasoftware.org/Merlin into master master
authorTrevor Irons <Trevor.Irons@lemmasoftware.org>
Sat, 12 Sep 2020 15:33:34 +0000 (09:33 -0600)
committerTrevor Irons <Trevor.Irons@lemmasoftware.org>
Sat, 12 Sep 2020 15:33:34 +0000 (09:33 -0600)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
@@@ -19,12 -19,15 +19,14 @@@ set_target_properties(merlin PROPERTIE
        VERSION  "${MERLIN_VERSION_NOQUOTES}"
        SOVERSION "${MERLIN_VERSION_MAJOR}.${MERLIN_VERSION_MINOR}"
        PROJECT_LABEL "MERLIN ${LABEL_SUFFIX}"
+       CXX_STANDARD 14
+     CXX_STANDARD_REQUIRED ON
  )
  
 -# Linking
 -target_link_libraries(merlin "lemmacore" "fdem1d" )
 -
 -# Linking
 -if ( LEMMA_VTK6_SUPPORT OR LEMMA_VTK7_SUPPORT ) 
 +###########
 +# Linking #
 +###########
 +if ( LEMMA_VTK8_SUPPORT ) 
        target_link_libraries(merlin ${VTK_LIBRARIES})
  endif()