Skip to content

Jessica Hawkwell / nitrogen

Go to a project
Commit e028c59c by Jessica Hawkwell
Options

Merge branch 'master' of mc.felinewith.me:LadySerenaKitty/nitrogen

2 parents 2bc06e76 be9c14e1
Inline Side-by-side
Showing with 3 additions and 0 deletions
CMakeLists.txt
......@@ -5,9 +5,12 @@ execute_process(COMMAND ./ver.sh OUTPUT_VARIABLE GIT_COMMIT OUTPUT_STRIP_TRAILIN
set(CMAKE_PROJECT_VERSION_TWEAK ${GIT_COMMIT})
set(PROJECT_VERSION_TWEAK ${GIT_COMMIT})
set(Nitrogen_VERSION_TWEAK ${GIT_COMMIT})
<<<<<<< HEAD
configure_file(Doxyfile.in Doxyfile)
execute_process(COMMAND doxygen ${CMAKE_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
=======
>>>>>>> be9c14e16a3d4dadc0602a50386ba5b6cbaaed53
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_C_STANDARD 11)
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!