moved all build artifacts to build

INTO-CPS-Association · May 29, 2020 · ea54507 · ea54507
1 parent 0bc12a0
commit ea54507
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -36,7 +36,7 @@ target_architecture(arch)
 message(${arch})
 
 if (NOT DEFINED THIRD_PARTY_LIBRARIES_ROOT)
-    set(THIRD_PARTY_LIBRARIES_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/external")
+    set(THIRD_PARTY_LIBRARIES_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/build/external")
     if (UNIX)
         if (APPLE)
             set(THIRD_PARTY_LIBRARIES_ROOT ${THIRD_PARTY_LIBRARIES_ROOT}/darwin)
@@ -45,7 +45,7 @@ if (NOT DEFINED THIRD_PARTY_LIBRARIES_ROOT)
         ENDIF ()
         set(THIRD_PARTY_LIBRARIES_ROOT ${THIRD_PARTY_LIBRARIES_ROOT}-${arch})
     ELSEIF (WIN32)
-        set(XercesC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/external/win-${arch}/cmake")
+        set(XercesC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/build/external/win-${arch}/cmake")
     ENDIF ()
 endif ()
 

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -35,17 +35,17 @@ build_xercersc()
  $1 make -C$2 install
 }
 
-if [ ! -d thirdparty/external/$install_name ]
+if [ ! -d build/external/$install_name ]
 then
 
-build_xercersc $script $working_dir/xerces-c thirdparty/external/$install_name
+build_xercersc $script $working_dir/xerces-c build/external/$install_name
 else
 echo "Dependency already generated"
 fi
 
 
 echo Running CMake
-
+rm -f thirdparty/rabbitmq-c/rabbitmq-c/librabbitmq/config.h
 ./$script cmake -B$working_dir -H.
 
 echo Compiling