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

in progress

parent 265e3820
# ============================================================================
# Copyright Jean-Charles LAMBERT - 2008-2016
# Copyright Jean-Charles LAMBERT - 2008-2018
# Centre de donneeS Astrophysiques de Marseille (CeSAM)
# e-mail: Jean-Charles.Lambert@lam.fr
# address: Aix Marseille Universite, CNRS, LAM
......@@ -59,7 +59,9 @@ FIND_PACKAGE(SQLITE3)
FIND_PACKAGE(HDF5 COMPONENTS CXX REQUIRED)
MESSAGE( STATUS "1) HDF5_CXX_LIBRARIES=" ${HDF5_CXX_LIBRARIES})
#SET(HDF5_CXX_LIBRARIES hdf5_hl_cpp.a hdf5_cpp.a hdf5.a) # use this trick to compile against hdf5 static libs, to keep compatibility between hdf5 libs, works only on mageia...
if(LINUX_ISSUE MATCHES "Mageia")
SET(HDF5_CXX_LIBRARIES hdf5_hl_cpp.a hdf5_cpp.a hdf5.a) # use this trick to compile against hdf5 static libs, to keep compatibility between hdf5 libs, works only on mageia...
endif()
MESSAGE( STATUS "2) HDF5_CXX_LIBRARIES=" ${HDF5_CXX_LIBRARIES})
#set (NEMO_INSTALLED FALSE) # fore NEMO not installed
......@@ -118,8 +120,8 @@ endif()
# ----------------------------------------------------------
# Install SETUP
# ----------------------------------------------------------
SET(PREFIX_LIB "lib")
SET(PREFIX_INC "inc")
SET(PREFIX_LIB "lib") # must be changed to lib64 when get rid of NEMO
SET(PREFIX_INC "inc") # must be changed to include when get rid of NEMO
SET(PREFIX_MAN "man")
SET(PREFIX_SCR "scripts")
......@@ -227,6 +229,7 @@ endif()
# UNS specific includes
INSTALL(FILES ${UNSIO2_BINARY_DIR}/../src/uns.h DESTINATION ${PREFIX_INC}/uns)
INSTALL(FILES ${UNSIO2_BINARY_DIR}/../src/version.h DESTINATION ${PREFIX_INC}/uns)
INSTALL(FILES ${UNSIO2_BINARY_DIR}/../src/unsdebug.h DESTINATION ${PREFIX_INC}/uns)
INSTALL(FILES ${UNSIO2_BINARY_DIR}/../src/snapshotinterface.h DESTINATION ${PREFIX_INC}/uns)
INSTALL(FILES ${UNSIO2_BINARY_DIR}/../src/componentrange.h DESTINATION ${PREFIX_INC}/uns)
......
......@@ -43,8 +43,10 @@ setup(
swig_opts=['-c++','-modern', '-I'+SRCPATH,'-I'+SRCPATH+'/../py/swig', '-Iswig'],
include_dirs = [numpy_include,SRCPATH],
libraries=['unsio'],
library_dirs=[os.environ['NEMOLIB']],
runtime_library_dirs=[os.environ['NEMOLIB']]
library_dirs=['/usr/lib64','/lib64'],
runtime_library_dirs=['/usr/lib64','/lib64']
#library_dirs=[os.environ['NEMOLIB']],
#runtime_library_dirs=[os.environ['NEMOLIB']]
)
],
install_requires=['numpy'],
......
......@@ -13,13 +13,13 @@
/**
@author Jean-Charles Lambert <Jean-Charles.Lambert@lam.fr>
*/
#ifndef VERSION_H
#define VERSION_H
#ifndef UNS_VERSION_H
#define UNS_VERSION_H
#define UNSIO_MAJOR "1"
#define UNSIO_MINOR "2"
#define UNSIO_PATCH "0"
#define UNSIO_EXTRA "-dev-Jun-2018"
#endif // VERSION_H
#endif // UNS_VERSION_H
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