Commit 799aa7ad authored by LAMBERT Jean-charles's avatar LAMBERT Jean-charles
Browse files

add EXTRA_INCLUDES and EXTRA_LINK_DIRS to CMakeLists.txt

parent 029ae82f
......@@ -39,6 +39,9 @@ MESSAGE( STATUS "core OPT =" ${OPT} )
MESSAGE( STATUS "OSX detected =" ${OSX} )
MESSAGE( STATUS "BUILD_TYPE =" ${RELEASE} )
MESSAGE( STATUS "EXTRA_INCLUDES =" ${EXTRA_INCLUDES} )
MESSAGE( STATUS "EXTRA_LINK_DIRS =" ${EXTRA_LINK_DIRS} )
# require NEMO
FIND_PACKAGE(NEMO REQUIRED)
# require UNSIO
......@@ -106,6 +109,7 @@ 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 (${EXTRA_INCLUDES})
if ( FALCON_INSTALLED )
include_directories (${DEHNEN}/falcON/utils/inc ${DEHNEN}/falcON/inc)
endif()
......@@ -113,7 +117,7 @@ include_directories (${UNSIOPATH}/lib ${UNSIOPATH}/inc ${UNSIOPATH}/inc/uns)
include_directories (/usr/include/malloc)
# Make sure the linker can find the Hello library once it is built.
link_directories ( ${UNSIOPATH}/lib ${DEHNEN}/falcON/lib ${DEHNEN}/utils/lib $ENV{PGPLOT_DIR} ${G2C_DIR} ${PROJECT_BINARY_DIR}/lib /usr/lib64 /usr/X11/lib ${FC_GFORT_PATH} ${FC_G77_PATH})
link_directories ( ${UNSIOPATH}/lib ${DEHNEN}/falcON/lib ${DEHNEN}/utils/lib $ENV{PGPLOT_DIR} ${G2C_DIR} ${PROJECT_BINARY_DIR}/lib /usr/lib64 /usr/X11/lib ${FC_GFORT_PATH} ${FC_G77_PATH} ${EXTRA_LINK_DIRS})
# ----------------------------------------------------------
# Install SETUP
......
......@@ -85,7 +85,7 @@ ENDIF(OSX)
SWIG_ADD_MODULE(${MODULENAME} python ${INTERFACE} ${execpp_sources} ${UNSIOPATH}/lib/libJCLutils.${SOEXT} ${UNSIOPATH}/lib/libJCLprojects.${SOEXT} ${UNSIOPATH}/lib/libunsio.${SOEXT} ${UNSIOPATH}/lib/libnemo.a)
# ${UNSIOPATH}/lib/libJCLprojects.${SOEXT}
SWIG_LINK_LIBRARIES(${MODULENAME} ${PYTHON_LIBRARIES} ${UNSIOPATH}/lib/libJCLutils.${SOEXT} ${UNSIOPATH}/lib/libJCLprojects.${SOEXT} ${UNSIOPATH}/lib/libunsio.${SOEXT} ${UNSIOPATH}/lib/libWDutils.${SOEXT} ${UNSIOPATH}/lib/libfalcON.${SOEXT} ${UNSIOPATH}/lib/libnemo.a ${UNSIOPATH}/lib/libcpgplot.a ${UNSIOPATH}/lib/libpgplot.so ${SQLITE3_LIB_PATH}/libsqlite3.${SOEXT} X11 gfortran)
SWIG_LINK_LIBRARIES(${MODULENAME} ${PYTHON_LIBRARIES} ${UNSIOPATH}/lib/libJCLutils.${SOEXT} ${UNSIOPATH}/lib/libJCLprojects.${SOEXT} ${UNSIOPATH}/lib/libunsio.${SOEXT} ${DEHNEN}/utils/lib/libWDutils.${SOEXT} ${DEHNEN}/falcON/lib/libfalcON.${SOEXT} ${UNSIOPATH}/lib/libnemo.a ${UNSIOPATH}/lib/libcpgplot.a ${UNSIOPATH}/lib/libpgplot.so ${SQLITE3_LIB_PATH}/libsqlite3.${SOEXT} X11 gfortran)
# ----------------------------------------------------------
# Install SETUP
# ----------------------------------------------------------
......
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