CDPP / AMDA_Kernel

Commit bb1830f9bb162e2afc79f793dadcd43c26bce1d3

Authored by Nathanael Jourdane
1 parent d65da2b3
Exists in centos7

Use BOOST_LIB var instead BOOST_ROOT

Showing 17 changed files with 37 additions and 36 deletions   Show diff stats
Inline Side-by-side
CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -24,8 +24,9 @@ if (EXISTS "$ENV{AMDA_COTS_DIR}")
24 24 set(AMDA_COTS_DIR "$ENV{AMDA_COTS_DIR}")
25 25 set(USERLOCAL_ROOT "$ENV{AMDA_COTS_DIR}/local")
26 26 set(AMDA_TOOLS_DIR "$ENV{AMDA_COTS_DIR}/tools")
27   - set(GCC_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/rtf")
28   - set(BOOST_ROOT "$ENV{AMDA_COTS_DIR}/tools/gcc/4.7.2/boost")
  27 + set(GCC_ROOT "/usr/lib/gcc")
  28 + set(BOOST_ROOT "/usr/include/boost")
  29 + set(BOOST_LIB "/usr/lib64/")
29 30 set(SONAR_ROOT "$ENV{AMDA_COTS_DIR}/tools/sonar")
30 31 set(FITNESSE_ROOT "$ENV{AMDA_COTS_DIR}/tools/fitnesse")
31 32 else()
... ...
src/Info/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -24,7 +24,7 @@ ADD_LIBRARY( Info SHARED ${source_files} )
24 24  
25 25 target_link_libraries(
26 26 Info
27   - ${BOOST_ROOT}/lib/libboost_system.so
28   - ${BOOST_ROOT}/lib/libboost_thread.so
  27 + ${BOOST_LIB}/libboost_system.so
  28 + ${BOOST_LIB}/libboost_thread.so
29 29 ${LIBXML2_LIBRARIES}
30 30 )
... ...
src/Main/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -39,8 +39,8 @@ target_link_libraries(
39 39 ${LOG4CXX_LIBRARIES}
40 40 Plugin
41 41 XMLParameterConfigurator
42   - ${BOOST_ROOT}/lib/libboost_system.so
43   - ${BOOST_ROOT}/lib/libboost_thread.so
  42 + ${BOOST_LIB}/libboost_system.so
  43 + ${BOOST_LIB}/libboost_thread.so
44 44 ParamOutputImpl
45 45 TimeTableCatalog
46 46 ${DDCLIENTLIBRARY}
... ...
src/ParamGetImpl/LocalFileInterface/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -36,7 +36,7 @@ target_link_libraries(
36 36 ${LOG4CXX_LIBRARIES}
37 37 ${libcdf_LIBRARIES}
38 38 ${libnetcdf_LIBRARIES}
39   - ${BOOST_ROOT}/lib/libboost_system.so
  39 + ${BOOST_LIB}/libboost_system.so
40 40 # AMDA_COMMON
41 41 Plugin
42 42 TimeTableCatalog
... ...
src/ParamOutputImpl/DataMining/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -36,8 +36,8 @@ target_link_libraries(
36 36 ParamOutputDataMiningImpl
37 37 ${LIBXML2_LIBRARIES}
38 38 ${cURL_LIBRARIES}
39   - ${BOOST_ROOT}/lib/libboost_system.so
40   - ${BOOST_ROOT}/lib/libboost_filesystem.so
  39 + ${BOOST_LIB}/libboost_system.so
  40 + ${BOOST_LIB}/libboost_filesystem.so
41 41 TimeTableCatalog
42 42 ${LOG4CXX_LIBRARIES}
43 43 # AMDA_COMMON
... ...
src/ParamOutputImpl/Download/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -34,8 +34,8 @@ ADD_LIBRARY( ParamOutputImpl SHARED ${source_files} )
34 34 target_link_libraries(
35 35 ParamOutputImpl
36 36 ${LOG4CXX_LIBRARIES}
37   - ${BOOST_ROOT}/lib/libboost_system.so
38   - ${BOOST_ROOT}/lib/libboost_thread.so
  37 + ${BOOST_LIB}/libboost_system.so
  38 + ${BOOST_LIB}/libboost_thread.so
39 39 ${libcdf_LIBRARIES}
40 40 rt
41 41 Parameters
... ...
src/ParamOutputImpl/Plot/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -61,9 +61,9 @@ target_link_libraries(
61 61 ${LOG4CXX_LIBRARIES}
62 62 ${PLplot_LIBRARIES}
63 63 ${QSAS_LIBRARIES}
64   - ${BOOST_ROOT}/lib/libboost_system.so
65   - ${BOOST_ROOT}/lib/libboost_thread.so
66   - ${BOOST_ROOT}/lib/libboost_regex.so
  64 + ${BOOST_LIB}/libboost_system.so
  65 + ${BOOST_LIB}/libboost_thread.so
  66 + ${BOOST_LIB}/libboost_regex.so
67 67 rt
68 68 Parameters
69 69 Info
... ...
src/ParamOutputImpl/Statistic/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -33,7 +33,7 @@ ADD_LIBRARY( ParamOutputStatisticImpl SHARED ${source_files} )
33 33 target_link_libraries(
34 34 ParamOutputStatisticImpl
35 35 ${LIBXML2_LIBRARIES}
36   - ${BOOST_ROOT}/lib/libboost_system.so
  36 + ${BOOST_LIB}/libboost_system.so
37 37 ${LOG4CXX_LIBRARIES}
38 38 # AMDA_COMMON
39 39 Plugin
... ...
src/Parameters/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -29,7 +29,7 @@ target_link_libraries(
29 29 TimeTableCatalog
30 30 ${LIBXML2_LIBRARIES}
31 31 ${LOG4CXX_LIBRARIES}
32   - ${BOOST_ROOT}/lib/libboost_system.so
33   - ${BOOST_ROOT}/lib/libboost_thread.so
  32 + ${BOOST_LIB}/libboost_system.so
  33 + ${BOOST_LIB}/libboost_thread.so
34 34 rt
35 35 )
... ...
src/PostProcessing/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -26,8 +26,8 @@ target_link_libraries(
26 26 PostProcessing
27 27 XMLConfigurator
28 28 ${LOG4CXX_LIBRARIES}
29   - ${BOOST_ROOT}/lib/libboost_iostreams.so
30   - ${BOOST_ROOT}/lib/libboost_filesystem.so
  29 + ${BOOST_LIB}/libboost_iostreams.so
  30 + ${BOOST_LIB}/libboost_filesystem.so
31 31 ${libarchive_LIBRARIES}
32 32 ${LIBXML2_LIBRARIES}
33   -)
34 33 \ No newline at end of file
  34 +)
... ...
src/SpiceKernel/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -29,8 +29,8 @@ ADD_LIBRARY( SpiceKernel SHARED ${source_files} )
29 29  
30 30 target_link_libraries(
31 31 SpiceKernel
32   - ${BOOST_ROOT}/lib/libboost_system.so
33   - ${BOOST_ROOT}/lib/libboost_thread.so
  32 + ${BOOST_LIB}/libboost_system.so
  33 + ${BOOST_LIB}/libboost_thread.so
34 34 ${LIBXML2_LIBRARIES}
35 35 ${libcspice_LIBRARIES}
36 36 TimeUtil
... ...
src/TimeTableCatalog/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -25,6 +25,6 @@ target_link_libraries(
25 25 ${LOG4CXX_LIBRARIES}
26 26 ${LIBXML2_LIBRARIES}
27 27 ${cURL_LIBRARIES}
28   - ${BOOST_ROOT}/lib/libboost_system.so
29   - ${BOOST_ROOT}/lib/libboost_filesystem.so
30   -)
31 28 \ No newline at end of file
  29 + ${BOOST_LIB}/libboost_system.so
  30 + ${BOOST_LIB}/libboost_filesystem.so
  31 +)
... ...
src/amdaParameterGenerator/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -33,9 +33,9 @@ target_link_libraries(
33 33 ${LOG4CXX_LIBRARIES}
34 34 Plugin
35 35 XMLParameterConfigurator
36   - ${BOOST_ROOT}/lib/libboost_system.so
37   - ${BOOST_ROOT}/lib/libboost_thread.so
38   - ${BOOST_ROOT}/lib/libboost_program_options.so
  36 + ${BOOST_LIB}/libboost_system.so
  37 + ${BOOST_LIB}/libboost_thread.so
  38 + ${BOOST_LIB}/libboost_program_options.so
39 39 ParamOutputImpl
40 40 TimeTableCatalog
41 41 Info
... ...
src/amdaParameterInfo/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -36,9 +36,9 @@ target_link_libraries(
36 36 ${LIBXML2_LIBRARIES}
37 37 Plugin
38 38 XMLParameterConfigurator
39   - ${BOOST_ROOT}/lib/libboost_system.so
40   - ${BOOST_ROOT}/lib/libboost_thread.so
41   - ${BOOST_ROOT}/lib/libboost_program_options.so
  39 + ${BOOST_LIB}/libboost_system.so
  40 + ${BOOST_LIB}/libboost_thread.so
  41 + ${BOOST_LIB}/libboost_program_options.so
42 42 ParamOutputImpl
43 43 TimeTableCatalog
44 44 Info
... ...
src/amdaXMLRequestorTool/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -36,8 +36,8 @@ target_link_libraries(
36 36 Parameters
37 37 XMLRequest
38 38 ${LOG4CXX_LIBRARIES}
39   - ${BOOST_ROOT}/lib/libboost_system.so
40   - ${BOOST_ROOT}/lib/libboost_thread.so
  39 + ${BOOST_LIB}/libboost_system.so
  40 + ${BOOST_LIB}/libboost_thread.so
41 41 ${LIBXML2_LIBRARIES}
42 42 Plugin
43 43 XMLParameterConfigurator
... ...
src/helpers/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -18,7 +18,7 @@ ADD_LIBRARY( helpers SHARED ${source_files} )
18 18  
19 19 target_link_libraries(
20 20 helpers
21   - ${BOOST_ROOT}/lib/libboost_system.so
22   - ${BOOST_ROOT}/lib/libboost_thread.so
  21 + ${BOOST_LIB}/libboost_system.so
  22 + ${BOOST_LIB}/libboost_thread.so
23 23 rt
24 24 )
... ...
test/DD_Client/CSlimFixtures/CMakeLists.txt
  Diff comments   View file @bb1830f
... ... @@ -23,7 +23,7 @@ file(
23 23 ADD_LIBRARY(DDClientCSlimFixtures SHARED ${source_files})
24 24  
25 25 target_link_libraries(DDClientCSlimFixtures
26   - ${BOOST_ROOT}/lib/libboost_regex.so
  26 + ${BOOST_LIB}/libboost_regex.so
27 27 TimeTableCatalog
28 28 png
29 29 )
... ...