Unverified Commit c69503c8 authored by Wuttke, Joachim's avatar Wuttke, Joachim Committed by GitHub
Browse files

Merge pull request #20 from jwuttke/master

This is release 2.0.6
parents 45253eaa 8084ad24
......@@ -25,3 +25,4 @@ build_script:
- cd build
- cmake -G "%CMAKE_GENERATOR%" ..
- cmake --build . --config %BUILD_CONF% -- /clp:ErrorsOnly
- ctest
#!/bin/sh
find . \( -name \*.h -or -name \*.cpp \) ! \( -path ./LevMar/\* -or -path ./gui/QCP/\* -or -path ./lib/test/\* -or -path ./*build/\* -or -path ./io/Caress/\* -or -path ./io/Mar/\* \) | sort
......@@ -2,6 +2,7 @@
*.*.user
html/
*~
*.tmp
build
mybuild
......
......@@ -7,7 +7,7 @@ os:
# - osx (temporari)
compiler:
# - clang (problems installing qt54base, qt54multimedia)
# - clang (problems installing qt54base)
- gcc
branches:
......@@ -40,5 +40,4 @@ addons:
- sourceline: ppa:beineri/opt-qt542-trusty
packages:
- qt54base
- qt54multimedia
- xvfb
cd build
xvfb-run tests/tests
ctest
cd build
xvfb-run tests/tests
ctest
get_filename_component(lib ${CMAKE_CURRENT_SOURCE_DIR} NAME)
set(lib caress_loader)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_HOME_DIRECTORY}/lib
${CMAKE_HOME_DIRECTORY}/core
${CMAKE_HOME_DIRECTORY}/lib # for message callback
)
if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
add_compile_options("-w") # legacy code with many warnings
endif ()
file (GLOB_RECURSE files *.h *.cpp)
file (GLOB files *.h *.hpp *.cpp)
add_library (${lib} ${files})
target_link_libraries (${lib}
Qt5::Core
)
target_link_libraries (${lib} Qt5::Core)
#ifndef __DATATYPES_H__E3273490_0327_478D_9A39_DCEF3078A6F4__INCLUDED__
#define __DATATYPES_H__E3273490_0327_478D_9A39_DCEF3078A6F4__INCLUDED__
#ifndef CAR_DATATYPES_H
#define CAR_DATATYPES_H
#undef PLATFORM
#undef BIG_ENDIAN
......@@ -165,4 +165,4 @@ double ieee64_swap(double x);
}
#endif
#endif /* __DATATYPES_H__E3273490_0327_478D_9A39_DCEF3078A6F4__INCLUDED__ */
#endif // CAR_DATATYPES_H
......@@ -17,8 +17,8 @@ update history:
------------------------------------------------------------------------*/
#ifndef CARESSGLOBALS_H
#define CARESSGLOBALS_H 1
#ifndef CAR_GLOBALS_H
#define CAR_GLOBALS_H
#include <stdio.h>
#include <stdlib.h>
......@@ -1091,7 +1091,7 @@ enum {
MODIDTYPE = 19, /* short int (module ID) */
/* cmdint - definitions */
ONOFFTYPE = 21, /* OT: strings "ON" or "OFF" (e.g. command CHECK) */
PMATRIXTYPE = 22, /* PT: strings "XX", "XY",..., "ZZ" (cmd PMATRIX) */
PMATRIXTYPE = 22, /* PT: strings "XX", "qpair",..., "ZZ" (cmd PMATRIX) */
DAUTYPE = 23, /* CT: strings "SI" or "MU" */
ENUMERATIONTYPE = 24, /* EN: indicating enumeration in xx_ranges.dat */
DAUDATATYPE = 25 /* IT: strings "I2" or "I4" in CONFIG command */
......@@ -1355,4 +1355,4 @@ struct perm_module_t {
}
#endif
#endif /* CARESSGLOBALS_H */
#endif // CAR_GLOBALS_H
......@@ -2,7 +2,7 @@ get_filename_component(lib ${CMAKE_CURRENT_SOURCE_DIR} NAME)
include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_HOME_DIRECTORY}/lib
${CMAKE_HOME_DIRECTORY}/core # LevMar is patched for message handling
)
file (GLOB_RECURSE files *.h *.hpp *.cpp)
......
......@@ -22,8 +22,6 @@
#ifndef _LEVMAR_H_
#define _LEVMAR_H_
void msg_cannotSolve(unsigned int n, unsigned int m);
/************************************* Start of configuration options *************************************/
/* Note that when compiling with CMake, this configuration section is automatically generated
* based on the user's input, see levmar.h.in
......
......@@ -32,12 +32,6 @@
#include "compiler.h"
#include "misc.h"
#include "typ/typ_log.h"
void msg_cannotSolve(uint n, uint m) {
MessageLogger::warn(str("levmar: cannot solve a problem with fewer measurements [%1] than unknowns [%2]\n").arg(n).arg(m));
}
#define EPSILON 1E-12
#define ONE_THIRD 0.3333333334 /* 1.0/3.0 */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment