From 6593ba1b248cea2b05ed38f41b97e777ec11fd87 Mon Sep 17 00:00:00 2001 From: Furkan Erdogan Date: Wed, 13 Jul 2022 08:55:35 +0000 Subject: [PATCH] Last modifications for #10038 --- CMakeLists.txt | 12 ------------ cmake/modules/FindCon2020.cmake | 2 +- src/ExternLib/InternalField/InternalFields.hh | 2 +- test/FitNesseRoot/ReleaseS/SecondPart/ReLease1/SprinT2/UserStory31/content.txt | 2 -- 4 files changed, 2 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01b546c..6dd9eab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,18 +1,6 @@ cmake_minimum_required(VERSION 2.6) PROJECT(AMDA-Kernel) -set(ENV{AMDA_COTS_DIR} "/opt") -set(ENV{USERLOCAL_ROOT} "/opt/local") -set(ENV{GCC_ROOT} "/usr") -set(ENV{BOOST_ROOT} "/usr") -set(ENV{DDSERVER_HOST_NAME} "172.200.0.10") -set(ENV{DDSERVER_PORT} 5000) -set(ENV{SONAR_ROOT} "/opt/tools/sonar") -set(ENV{FITNESSE_ROOT} "/opt/tools/FitNesse") -set(ENV{SPICE_KERNELS_DATA} "/usr/local/data/ORBITS/Kernels") -set(ENV{PATH} "/usr/bin:/opt/local/bin:${PATH}") -set(ENV{LD_LIBRARY_PATH} "/usr/lib64:/usr/lib:/opt/local/lib:${LD_LIBRARY_PATH}") - SET(CPACK_PACKAGE_VERSION_MAJOR "3") SET(CPACK_PACKAGE_VERSION_MINOR "6") diff --git a/cmake/modules/FindCon2020.cmake b/cmake/modules/FindCon2020.cmake index 3b868f6..e420898 100644 --- a/cmake/modules/FindCon2020.cmake +++ b/cmake/modules/FindCon2020.cmake @@ -1,6 +1,6 @@ FIND_PATH(CON2020INCLUDE_DIR libcon2020.h HINTS - ${USERLOCAL_ROOT}/include + ${USERLOCAL_ROOT}/include/libcon2020 NO_DEFAULT_PATH ) mark_as_advanced(CON2020INCLUDE_DIR) diff --git a/src/ExternLib/InternalField/InternalFields.hh b/src/ExternLib/InternalField/InternalFields.hh index a975957..f4b42c1 100644 --- a/src/ExternLib/InternalField/InternalFields.hh +++ b/src/ExternLib/InternalField/InternalFields.hh @@ -8,7 +8,7 @@ #define INTERNALFIELDS_HH #include "libinternalfield.h" -#include "libcon2020.h" +#include "libcon2020/libcon2020.h" #include "Parameter.hh" #include "ParamData.hh" diff --git a/test/FitNesseRoot/ReleaseS/SecondPart/ReLease1/SprinT2/UserStory31/content.txt b/test/FitNesseRoot/ReleaseS/SecondPart/ReLease1/SprinT2/UserStory31/content.txt index d90dd9f..aeeb0d2 100644 --- a/test/FitNesseRoot/ReleaseS/SecondPart/ReLease1/SprinT2/UserStory31/content.txt +++ b/test/FitNesseRoot/ReleaseS/SecondPart/ReLease1/SprinT2/UserStory31/content.txt @@ -72,7 +72,6 @@ !|script|TestAmdaCommandLine| |set|${path}|path| |note|!- Suppression des archives créées -!| - |check|execute|!- rm -!|command|-f *.zip |args|0| |check|execute|!- rm -!|command|-f *.gz |args|0| |check|execute|!- rm -!|command|-f *.tar |args|0| @@ -144,7 +143,6 @@ !|script|TestAmdaCommandLine| |set|${path}|path| |note|!- Suppression des archives créées -!| - |check|execute|!- rm -!|command|-f *.zip |args|0| |check|execute|!- rm -!|command|-f *.gz |args|0| |check|execute|!- rm -!|command|-f *.tar |args|0| -- libgit2 0.21.2