diff --git a/CMake/config/CompilerFlagsHelpers.cmake b/CMake/config/CompilerFlagsHelpers.cmake index cd4763be6..247af388f 100644 --- a/CMake/config/CompilerFlagsHelpers.cmake +++ b/CMake/config/CompilerFlagsHelpers.cmake @@ -99,6 +99,17 @@ foreach(COMPILER_LANGUAGE ${SUPPORTED_COMPILER_LANGUAGE_LIST}) # CLANG elseif(CMAKE_${COMPILER_LANGUAGE}_COMPILER_IS_CLANG) + set(CMAKE_${COMPILER_LANGUAGE}_WARNING_ALL "-Wall") + set(CMAKE_${COMPILER_LANGUAGE}_DEBUGINFO_FLAGS "-g") + + set(CMAKE_${COMPILER_LANGUAGE}_OPT_NONE "-O0") + set(CMAKE_${COMPILER_LANGUAGE}_OPT_NORMAL "-O2") + set(CMAKE_${COMPILER_LANGUAGE}_OPT_AGGRESSIVE "-O3") + set(CMAKE_${COMPILER_LANGUAGE}_OPT_FASTEST "-Ofast -march=native") + + set(CMAKE_${COMPILER_LANGUAGE}_STACK_PROTECTION "-fstack-protector") + set(CMAKE_${COMPILER_LANGUAGE}_POSITION_INDEPENDENT "-fPIC") + # Force same ld behavior as when called from gcc --as-needed forces the linker to check whether # a dynamic library mentioned in the command line is actually needed by the objects being # linked. Symbols needed in shared objects are already linked when building that library. diff --git a/tests/jenkins/Jenkinsfile b/tests/jenkins/Jenkinsfile index ad30fc6c8..10d1c86fe 100644 --- a/tests/jenkins/Jenkinsfile +++ b/tests/jenkins/Jenkinsfile @@ -139,7 +139,7 @@ pipeline { stage('tqperf'){ steps{ dir('tqperf'){ - git url: 'https://github.com/nrnhines/tqperf.git' + git url: 'https://github.com/neuronsimulator/tqperf' } } } diff --git a/tests/jenkins/nrnivmodl-core.sh b/tests/jenkins/nrnivmodl-core.sh index c5bcbb3a1..7e4700fd3 100755 --- a/tests/jenkins/nrnivmodl-core.sh +++ b/tests/jenkins/nrnivmodl-core.sh @@ -15,12 +15,19 @@ mkdir -p ${CORENRN_TYPE} pushd ${CORENRN_TYPE} set +x + +# tqperf has extra mod files under modx +if [ "${TEST_DIR}" = "tqperf" ]; then + cp ../modx/*.mod ../mod/ + extra_args="-l -lcrypto" +fi + if [ "${TEST_DIR}" = "ringtest" ]; then echo "Running install_${CORENRN_TYPE}/bin/nrnivmodl-core ." $WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core . else echo "Running install_${CORENRN_TYPE}/bin/nrnivmodl-core ../mod" - $WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core ../mod + $WORKSPACE/install_${CORENRN_TYPE}/bin/nrnivmodl-core ${extra_args} ../mod fi set -x diff --git a/tests/jenkins/nrnivmodl.sh b/tests/jenkins/nrnivmodl.sh index 5f7817c7f..e7846b585 100755 --- a/tests/jenkins/nrnivmodl.sh +++ b/tests/jenkins/nrnivmodl.sh @@ -8,4 +8,10 @@ set -x TEST_DIR="$1" cd $WORKSPACE/${TEST_DIR} -nrnivmodl mod + +# tqperf has extra mod files under modx +if [ "${TEST_DIR}" = "tqperf" ]; then + cp modx/*.mod mod/ +fi + +nrnivmodl -loadflags -lcrypto mod