cmake: change default ACADOS_INSTALL_DIR back - appveyor fix: diable …

…shared libs
StanfordMSL · Aug 15, 2019 · 445606b · 445606b
1 parent 3e798de
commit 445606b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -2,21 +2,14 @@ branches:
   only:
     - master
 
-install:
-  # - call C:\Miniconda36-x64\Scripts\activate.bat
-  # - conda install --yes -c msys2 m2w64-gcc-libgfortran m2w64-openblas
+# NOTE: only static linking, i.e. via .lib file supported
+#  -D BUILD_SHARED_LIBS=OFF;
+# extern "C" {  would have to be added to subprojects
 
 build_script:
   - git submodule update --init --recursive
   - cmake -E make_directory build
-  - cmake -E chdir build cmake -D BLASFEO_TARGET=GENERIC -D HPIPM_TARGET=GENERIC -D ACADOS_INSTALL_DIR=c:\projects\%APPVEYOR_PROJECT_SLUG ..
-  # - cmake --build build --config Debug
-  # - cmake -E chdir build ctest --output-on-failure
+  - cmake -E chdir build cmake -D BLASFEO_TARGET=GENERIC -D HPIPM_TARGET=GENERIC -D BUILD_SHARED_LIBS=OFF -D ACADOS_EXAMPLES=ON ..
   - cmake --build build --config Release
-  - cmake -E chdir build ctest --output-on-failure
-  - rm -fr build
-  - cmake -E make_directory build
-  - cmake -E make_directory appveyor-artifacts
-  # - cmake -E chdir build cmake -D BLASFEO_TARGET=GENERIC -D HPIPM_TARGET=GENERIC -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%\appveyor-artifacts ..
-  # - cmake -E chdir build cmake -D BLASFEO_TARGET=GENERIC -D HPIPM_TARGET=GENERIC -D CMAKE_BUILD_TYPE=Release -D ACADOS_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER%\appveyor-artifacts ..
-  - cmake --build build --target install
+  - cmake -E chdir build ctest -V
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,7 +34,7 @@ set(BLASFEO_TARGET "X64_INTEL_HASWELL" CACHE STRING "BLASFEO Target architecture
 set(HPIPM_TARGET "AVX" CACHE STRING "HPIPM Target architecture")
 set(LA "HIGH_PERFORMANCE" CACHE STRING "Linear algebra optimization level")
 
-option(BUILD_SHARED_LIBS "Build shared libs" ON)
+set(BUILD_SHARED_LIBS ON CACHE STRING "Build shared libraries")
 
 # Additional targets
 option(ACADOS_UNIT_TESTS "Compile Unit tests" OFF)

diff --git a/ci/shared/script_acados_release.sh b/ci/shared/script_acados_release.sh
@@ -66,6 +66,7 @@ function build_acados {
 
 	[ $? -ne 0 ] && exit 100;
 	if [ -n "${COVERAGE}" ]; then
+		echo "analyzing test coverage";
 		cmake --build build --target acados_coverage || \
 		  echo "Coverage report not generated";
 	fi