the serveur will be in maintenance mode Thursday February 25 from 7:00 to 12:00 ( git and registry will be unreacheable)

Commit 8e9ea6ae authored by LAMBERT Jean-charles's avatar LAMBERT Jean-charles

fix conflict

parent fd119567
......@@ -118,7 +118,7 @@ MESSAGE( STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH} )
include_directories (${PROJECT_SOURCE_DIR}/src )
include_directories (${PROJECT_SOURCE_DIR}/lib/utils ${PROJECT_SOURCE_DIR}/lib/utils/nemodep )
include_directories (${PROJECT_SOURCE_DIR}/lib/projects ${PROJECT_SOURCE_DIR}/lib/projects/nemodep)
include_directories (/usr/include/CCfits /usr/include/cfitsio)
include_directories (/usr/include/CCfits /usr/include/cfitsioi /opt/usr/include/CCfits)
include_directories (${EXTRA_INCLUDES})
if ( FALCON_INSTALLED )
include_directories (${DEHNEN}/falcON/utils/inc ${DEHNEN}/falcON/inc)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment