Compatibility with centos7 (wip)

Nathanael Jourdane
1 parent 96e26914
Showing 10 changed files with 32 additions and 30 deletions Show diff stats
.gitignore
cmake/modules/FindArchive.cmake
cmake/modules/FindCSPICE.cmake
cmake/modules/FindLibXML2.cmake
cmake/modules/FindLog4Cxx.cmake
cmake/modules/FindNetCDF.cmake
cmake/modules/FindPLplot.cmake
cmake/modules/FindcURL.cmake
script/deploy.sh
src/helpers/dsgpatt_Singleton.hh
@@ -15,3 +15,4 @@ test/FitNesseRoot/properties
 test/FitNesseRoot/updateDoNotCopyOverList
 test/FitNesseRoot/updateList
 test/FitNesseRoot/RecentChanges/
+.idea
@@ -5,8 +5,8 @@
 # libarchive_INCLUDE_DIR - the libarchive include directory
 # libarchive_LIBRARIES - the libarchive library directory
  
-FIND_PATH(libarchive_INCLUDE_DIR archive.h PATHS ${USERLOCAL_ROOT}/include NO_DEFAULT_PATH)
-FIND_LIBRARY(libarchive_LIBRARIES NAMES archive PATHS ${USERLOCAL_ROOT}/lib NO_DEFAULT_PATH)
+FIND_PATH(libarchive_INCLUDE_DIR archive.h PATHS ${USERLOCAL_ROOT}/include /usr/include/ NO_DEFAULT_PATH)
+FIND_LIBRARY(libarchive_LIBRARIES NAMES archive PATHS ${USERLOCAL_ROOT}/lib /usr/lib64/ NO_DEFAULT_PATH)
  
 # set FOUND flag
 IF(libarchive_INCLUDE_DIR AND libarchive_LIBRARIES)
@@ -16,7 +16,7 @@ IF(libcspice_INCLUDE_DIR AND libcspice_LIBRARIES)
 	endif(NOT libcspice_FIND_QUIETLY)
 ELSE(libcspice_INCLUDE_DIR AND libcspice_LIBRARIES)
 	SET(libcspice_FOUND 0 CACHE BOOL "Not found libcspice library")
-	message(STATUS "NOT Found libcspice, disabling it")
+	message(STATUS "NOT Found libcspice, disabling it - ${libcspice_INCLUDE_DIR}, ${libcspice_LIBRARIES}")
 ENDIF(libcspice_INCLUDE_DIR AND libcspice_LIBRARIES)
  
 MARK_AS_ADVANCED(libcspice_INCLUDE_DIR libcspice_LIBRARIES)
 # - Try to find LibXml2
 # Once done this will define
 #  LIBXML2_FOUND - System has LibXml2
-#  LIBXML2_INCLUDE_DIRS - The LibXml2 include directories
+#  LIBXML2_INCLUDE_DIR - The LibXml2 include directories
 #  LIBXML2_LIBRARIES - The libraries needed to use LibXml2
 #  LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
  
-FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xinclude.h PATHS ${USERLOCAL_ROOT}/include/libxml2 NO_DEFAULT_PATH)
+FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xinclude.h PATHS ${USERLOCAL_ROOT}/include/libxml2 /usr/include/libxml2 NO_DEFAULT_PATH)
  
-FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 PATHS ${USERLOCAL_ROOT}/lib NO_DEFAULT_PATH)
+FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 PATHS ${USERLOCAL_ROOT}/lib /usr/lib64/ NO_DEFAULT_PATH)
  
 IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
     SET(LibXML2_FOUND 1)
@@ -25,8 +25,8 @@
 # LOG4CXX_INCLUDE_DIR - the liblog4cxx include directory
 # LOG4CXX_LIBRARIES - liblog4cxx library
  
-FIND_PATH(LOG4CXX_INCLUDE_DIR logger.h PATHS ${USERLOCAL_ROOT}/include/log4cxx NO_DEFAULT_PATH)
-FIND_LIBRARY(LOG4CXX_LIBRARIES NAMES log4cxx log4cxxd PATHS ${USERLOCAL_ROOT}/lib NO_DEFAULT_PATH)
+FIND_PATH(LOG4CXX_INCLUDE_DIR logger.h PATHS ${USERLOCAL_ROOT}/include/log4cxx /usr/include/log4cxx NO_DEFAULT_PATH)
+FIND_LIBRARY(LOG4CXX_LIBRARIES NAMES log4cxx log4cxxd PATHS ${USERLOCAL_ROOT}/lib /usr/lib64/ NO_DEFAULT_PATH)
  
 IF(LOG4CXX_INCLUDE_DIR AND LOG4CXX_LIBRARIES)
 SET(Log4cxx_FOUND 1)
@@ -5,8 +5,8 @@
 # libnetcdf_INCLUDE_DIR - the libnetcdf include directory
 # libnetcdf_LIBRARIES - the libnetcdf library directory
  
-FIND_PATH(libnetcdf_INCLUDE_DIR netcdf.h PATHS ${USERLOCAL_ROOT}/include NO_DEFAULT_PATH)
-FIND_LIBRARY(libnetcdf_LIBRARIES NAMES netcdf PATHS ${USERLOCAL_ROOT}/lib NO_DEFAULT_PATH)
+FIND_PATH(libnetcdf_INCLUDE_DIR netcdf.h PATHS ${USERLOCAL_ROOT}/include /usr/include NO_DEFAULT_PATH)
+FIND_LIBRARY(libnetcdf_LIBRARIES NAMES netcdf libnetcdf PATHS ${USERLOCAL_ROOT}/lib /usr/lib64 NO_DEFAULT_PATH)
  
 # set FOUND flag
 IF(libnetcdf_INCLUDE_DIR AND libnetcdf_LIBRARIES)
@@ -6,9 +6,9 @@
 # PLplot_LIBRARIES - the libplplotcxxd library directory
 # QSAS_LIBRARIES - the libqsastime library directory
  
-FIND_PATH(PLplot_INCLUDE_DIR plplot.h PATHS ${USERLOCAL_ROOT}/include/plplot NO_DEFAULT_PATH)
-FIND_LIBRARY(PLplot_LIBRARIES NAMES plplotcxxd PATHS ${USERLOCAL_ROOT}/lib NO_DEFAULT_PATH)
-FIND_LIBRARY(QSAS_LIBRARIES NAMES qsastime PATHS ${USERLOCAL_ROOT}/lib NO_DEFAULT_PATH)
+FIND_PATH(PLplot_INCLUDE_DIR plplot.h PATHS ${USERLOCAL_ROOT}/include/plplot /usr/include/plplot NO_DEFAULT_PATH)
+FIND_LIBRARY(PLplot_LIBRARIES NAMES plplotcxxd libplplotd PATHS ${USERLOCAL_ROOT}/lib /usr/lib64/ NO_DEFAULT_PATH)
+FIND_LIBRARY(QSAS_LIBRARIES NAMES qsastime libqsastime PATHS ${USERLOCAL_ROOT}/lib /usr/lib64/ NO_DEFAULT_PATH)
  
 # set FOUND flag
 IF(PLplot_INCLUDE_DIR AND PLplot_LIBRARIES AND QSAS_LIBRARIES)
@@ -5,8 +5,8 @@
 # cURL_INCLUDE_DIR - the libcurl include directory
 # cURL_LIBRARIES - the libcurl library directory
  
-FIND_PATH(cURL_INCLUDE_DIR curl.h PATHS ${USERLOCAL_ROOT}/include/curl NO_DEFAULT_PATH)
-FIND_LIBRARY(cURL_LIBRARIES NAMES curl PATHS ${USERLOCAL_ROOT}/lib NO_DEFAULT_PATH)
+FIND_PATH(cURL_INCLUDE_DIR curl.h PATHS ${USERLOCAL_ROOT}/include/curl /usr/include/curl NO_DEFAULT_PATH)
+FIND_LIBRARY(cURL_LIBRARIES NAMES curl PATHS ${USERLOCAL_ROOT}/lib /usr/lib64 NO_DEFAULT_PATH)
  
 # set FOUND flag
 IF(cURL_INCLUDE_DIR AND cURL_LIBRARIES)
@@ -34,17 +34,17 @@ then
     exit 1
 fi
  
-if [ ! -d "$COTS_DIR/tools/gcc" ]; then
-    echo -e $usage
-    echo "[ERROR] Cannot find GCC tool directory $COTS_DIR/tools/gcc"
-    exit 1
-fi
-
-if [ ! -d "$COTS_DIR/local/lib" ]; then
-    echo -e $usage
-    echo "[ERROR] Cannot find lib directory $COTS_DIR/local/lib"
-    exit 1
-fi
+#if [ ! -d "$COTS_DIR/tools/gcc" ]; then
+#    echo -e $usage
+#    echo "[ERROR] Cannot find GCC tool directory $COTS_DIR/tools/gcc"
+#    exit 1
+#fi
+#
+#if [ ! -d "$COTS_DIR/local/lib" ]; then
+#    echo -e $usage
+#    echo "[ERROR] Cannot find lib directory $COTS_DIR/local/lib"
+#    exit 1
+#fi
  
 if [ "$DDSERVER_HOST_NAME" = "" ]
 then
@@ -72,11 +72,12 @@ fi
 export AMDA_COTS_DIR="$COTS_DIR"
 export DDSERVER_HOST_NAME="$DDSERVER_HOST_NAME"
 export DDSERVER_PORT="$DDSERVER_PORT"
-export LD_LIBRARY_PATH="$COTS_DIR/tools/gcc/4.7.2/rtf/lib64:$COTS_DIR/tools/gcc/4.7.2/rtf/lib:$COTS_DIR/local/lib:$LD_LIBRARY_PATH"
-export PATH="$COTS_DIR/tools/gcc/4.7.2/rtf/bin:$COTS_DIR/local/bin:$PATH"
+#export LD_LIBRARY_PATH="$COTS_DIR/tools/gcc/4.7.2/rtf/lib64:$COTS_DIR/tools/gcc/4.7.2/rtf/lib:$COTS_DIR/local/lib:$LD_LIBRARY_PATH"
+#export PATH="$COTS_DIR/tools/gcc/4.7.2/rtf/bin:$COTS_DIR/local/bin:$PATH"
  
 cmake -E make_directory "$SCRIPTDIR/../build"
 cmake -E make_directory "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE"
-cmake -E chdir "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE" cmake -DCMAKE_C_COMPILER="$COTS_DIR/tools/gcc/4.7.2/rtf/bin/gcc" -DCMAKE_CXX_COMPILER="$COTS_DIR/tools/gcc/4.7.2/rtf/bin/g++" -DCMAKE_BUILD_TYPE=$KERNEL_BUILD_TYPE ../..
+#cmake -E chdir "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE" cmake -DCMAKE_C_COMPILER="$COTS_DIR/tools/gcc/4.7.2/rtf/bin/gcc" -DCMAKE_CXX_COMPILER="$COTS_DIR/tools/gcc/4.7.2/rtf/bin/g++" -DCMAKE_BUILD_TYPE=$KERNEL_BUILD_TYPE ../..
+cmake -E chdir "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE" cmake -DCMAKE_C_COMPILER="/usr/bin/gcc" -DCMAKE_CXX_COMPILER="/usr/bin/g++" -DCMAKE_BUILD_TYPE=$KERNEL_BUILD_TYPE ../..
 cmake --build "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE"
 make -C "$SCRIPTDIR/../build/$KERNEL_BUILD_TYPE" install VERBOSE=1
@@ -35,7 +35,7 @@ DESCRIPTION
 #define _PATTERN_SINGLETON_HH_ 1
  
 #include <boost/thread/mutex.hpp>
-
+#include <boost/thread/locks.hpp>
 /**
  
 */