diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 167c92c271bdf9fbf1df019b88bb510c05f55d90..207f13ad266fb3e491aab31340be090ac1c9e8d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ win_visual_studio_static_local_deps: stage: build before_script: + - rmdir /s /q build external_dependencies/* - call VsDevCmd.bat - set DEPENDENCIES_LINK_TYPE=static - set clean_after=yes @@ -35,7 +36,7 @@ win_visual_studio_2015_static_local_deps: stage: build before_script: - - call VsDevCmd.bat + - rmdir /s /q build external_dependencies/* - set DEPENDENCIES_LINK_TYPE=static - set clean_after=yes - set BUILD_LIB=yes @@ -54,6 +55,7 @@ ubuntu_boost_system: stage: build before_script: + - rm -rf build external_dependencies/* - export TERM=xterm - export DEPENDENCIES_LINK_TYPE=shared - export CLEAN_AFTER=yes @@ -72,6 +74,7 @@ ubuntu_boost_local_static_deps: stage: build before_script: + - rm -rf build external_dependencies/* - export TERM=xterm - export DEPENDENCIES_LINK_TYPE=static - export CLEAN_AFTER=yes @@ -90,6 +93,7 @@ centos_local_deps: stage: build before_script: + - rm -rf build external_dependencies/* - export TERM=xterm - export DEPENDENCIES_LINK_TYPE=static - export CLEAN_AFTER=yes diff --git a/build.sh b/build.sh old mode 100644 new mode 100755 diff --git a/build_scripts/windows/win_VS2015_build_x64_release.bat b/build_scripts/windows/win_VS2015_build_x64_release.bat index 27d49a0f01fed83515b23f4f65cfca2fedbc645b..9bb339c602ec41378236787cc2b70d1b6711dda9 100644 --- a/build_scripts/windows/win_VS2015_build_x64_release.bat +++ b/build_scripts/windows/win_VS2015_build_x64_release.bat @@ -8,18 +8,19 @@ set BUILD_EXAMPLES=yes rem call VsDevCmd.bat - title Building the 'lib4neuro' project for Release [preparing makefiles] - - rem C++ compiler (Requires Visual Studio 2017) - set CXX_COMPILER=cl - set C_COMPILER=cl +title Building the 'lib4neuro' project for Release [preparing makefiles] - set MAKEFILE_GENERATOR="Visual Studio 15 2017 Win64" - - cmake -G "Visual Studio 14 2015 Win64" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% -S . -B build - title Building the 'lib4neuro' project for Release [building] +rem C++ compiler (Requires Visual Studio 2015) +set CXX_COMPILER=cl +set C_COMPILER=cl + +set MAKEFILE_GENERATOR="Visual Studio 14 2015 Win64" + +cmake -G %MAKEFILE_GENERATOR% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% -S . -B build + +title Building the 'lib4neuro' project for Release [building] - call set_env_n_cores.bat +call set_env_n_cores.bat if "%BUILD_SOMETHING_LIB%" == "yes" ( cmake --build build -j %N_CORES% --config Release && echo "Build complete." diff --git a/build_scripts/windows/win_VS_build_x64_release.bat b/build_scripts/windows/win_VS_build_x64_release.bat index 2f783f7e79e6d286d416b86d4b01ce8129b42e64..46d141f7b36a69aa5649483e10fb5c9187df4ec3 100644 --- a/build_scripts/windows/win_VS_build_x64_release.bat +++ b/build_scripts/windows/win_VS_build_x64_release.bat @@ -16,7 +16,7 @@ rem call VsDevCmd.bat set MAKEFILE_GENERATOR="Visual Studio 15 2017 Win64" - cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% -S . -B build + cmake -G %MAKEFILE_GENERATOR% -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=%CXX_COMPILER% -DCMAKE_C_COMPILER=%C_COMPILER% -DBOOST_ROOT=%BOOST_ROOT% -DBOOST_LIBRARYDIR=%BOOST_LIBRARYDIR% -DBOOST_INCLUDEDIR=%BOOST_INCLUDEDIR% -DBUILD_TESTS=%BUILD_TESTS% -DBUILD_EXAMPLES=%BUILD_EXAMPLES% -DBUILD_LIB=%BUILD_LIB% -DLIB4NEURO_DIR=build\lib -DDEPENDENCIES_LINK_TYPE=%LINK_TYPE% -DLIB4NEURO_INCLUDE_DIR=%LIB4NEURO_INCLUDE_DIR% -S . -B build title Building the 'lib4neuro' project for Release [building] call set_env_n_cores.bat diff --git a/clean.sh b/clean.sh old mode 100644 new mode 100755 diff --git a/src/constants.h b/src/constants.h index 0976096bce46fca7623bbf0069770805148d1e42..f8bfa80cbf5afadafd0836a14a5d287e8a3ec041 100644 --- a/src/constants.h +++ b/src/constants.h @@ -8,3 +8,4 @@ namespace lib4neuro{ } #endif //INC_4NEURO_CONSTANTS_H +