Commit 1971966c authored by jclamber's avatar jclamber

fix compilation issue on Mac

git-svn-id: http://svn.oamp.fr/repos/unsio/trunk@128 ce2cc22f-6084-46ce-a062-084b172ee5dc
parent af0285d2
...@@ -45,7 +45,8 @@ FILE(GLOB LIBUTILS ../src/fortran_old_gcc/*.c ) ...@@ -45,7 +45,8 @@ FILE(GLOB LIBUTILS ../src/fortran_old_gcc/*.c )
add_library (nemomaing77 ${LIBTYPE} ${LIBUTILS}) add_library (nemomaing77 ${LIBTYPE} ${LIBUTILS})
if(OSX) if(OSX)
set_target_properties(MNESSutils PROPERTIES LINK_FLAGS "-undefined suppress -flat_namespace") set_target_properties(nemo PROPERTIES LINK_FLAGS "-undefined suppress -flat_namespace")
set_target_properties(nemomaing77 PROPERTIES LINK_FLAGS "-undefined suppress -flat_namespace")
endif(OSX) endif(OSX)
# Destination path for the lib # Destination path for the lib
SET(LIBRARY_OUTPUT_PATH ../lib) SET(LIBRARY_OUTPUT_PATH ../lib)
...@@ -65,7 +66,7 @@ SET(NEMOLIB ${PROJECT_SOURCE_DIR}/../lib) ...@@ -65,7 +66,7 @@ SET(NEMOLIB ${PROJECT_SOURCE_DIR}/../lib)
SET(NEMOINC ${PROJECT_SOURCE_DIR}/../src/inc) SET(NEMOINC ${PROJECT_SOURCE_DIR}/../src/inc)
# Make sure the compiler can find include files from our Hello library. # Make sure the compiler can find include files from our Hello library.
include_directories (../src/inc ) include_directories (../src/inc /usr/include/malloc)
# #
# install bin targets # install bin targets
......
...@@ -96,7 +96,7 @@ set(EXECUTABLE_OUTPUT_PATH bin) ...@@ -96,7 +96,7 @@ set(EXECUTABLE_OUTPUT_PATH bin)
MESSAGE( STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH} ) MESSAGE( STATUS "EXECUTABLE_OUTPUT_PATH: " ${EXECUTABLE_OUTPUT_PATH} )
# Make sure the compiler can find include files from our Hello library. # Make sure the compiler can find include files from our Hello library.
include_directories (${UNSIO_SOURCE_DIR}/src ${NEMOINC} ${NEMOLIB} ${SQLITE3_H_PATH}) include_directories (${UNSIO_SOURCE_DIR}/src ${NEMOINC} ${NEMOLIB} ${SQLITE3_H_PATH} /usr/include/malloc)
# Make sure the linker can find the Hello library once it is built. # Make sure the linker can find the Hello library once it is built.
link_directories (${UNSIO_BINARY_DIR}/lib /usr/X11/lib ${SQLITE3_LIB_PATH} ${NEMOLIB} ${FC_GFORT_PATH} ${FC_G77_PATH}) link_directories (${UNSIO_BINARY_DIR}/lib /usr/X11/lib ${SQLITE3_LIB_PATH} ${NEMOLIB} ${FC_GFORT_PATH} ${FC_G77_PATH})
......
...@@ -41,7 +41,7 @@ installation path will be ...@@ -41,7 +41,7 @@ installation path will be
2) you specify your own installation path 2) you specify your own installation path
------------------------------------------ ------------------------------------------
mkdir build-test mkdir build-test
cd nuild_test cd build_test
cmake .. -DCMAKE_INSTALL_PREFIX="/mypath/toinstall" cmake .. -DCMAKE_INSTALL_PREFIX="/mypath/toinstall"
Will configure unsio in "debug" mode, with shared library and Will configure unsio in "debug" mode, with shared library and
......
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