Browse Source

Merge branch 'master' of https://git.lemmasoftware.org/Merlin into master

master
Trevor Irons 3 years ago
parent
commit
43d5c7328b
1 changed files with 2 additions and 0 deletions
  1. 2
    0
      CMakeLists.txt

+ 2
- 0
CMakeLists.txt View File

19
 	VERSION  "${MERLIN_VERSION_NOQUOTES}"
19
 	VERSION  "${MERLIN_VERSION_NOQUOTES}"
20
 	SOVERSION "${MERLIN_VERSION_MAJOR}.${MERLIN_VERSION_MINOR}"
20
 	SOVERSION "${MERLIN_VERSION_MAJOR}.${MERLIN_VERSION_MINOR}"
21
 	PROJECT_LABEL "MERLIN ${LABEL_SUFFIX}"
21
 	PROJECT_LABEL "MERLIN ${LABEL_SUFFIX}"
22
+	CXX_STANDARD 14
23
+    CXX_STANDARD_REQUIRED ON
22
 )
24
 )
23
 
25
 
24
 ###########
26
 ###########

Loading…
Cancel
Save