diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-05-31 10:09:44 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2007-05-31 10:09:44 +0000 |
| commit | eab54b49eadbe926284a7ed6ecc585cf2788c84a (patch) | |
| tree | cd4c53cf2588bf49bc8218cd0f7ac79c0d1e9da6 /tvmet-1.7.1/include/tvmet | |
| parent | 8f202dc67fed62f3a6600f744644fbb61d7e4e29 (diff) | |
More cleanup, add CMakeLists for the testsuite. Now need to port it
to QTestLib :/
Diffstat (limited to 'tvmet-1.7.1/include/tvmet')
| -rw-r--r-- | tvmet-1.7.1/include/tvmet/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | tvmet-1.7.1/include/tvmet/config.h.cmake | 2 | ||||
| -rw-r--r-- | tvmet-1.7.1/include/tvmet/tvmet.h | 19 |
3 files changed, 9 insertions, 26 deletions
diff --git a/tvmet-1.7.1/include/tvmet/CMakeLists.txt b/tvmet-1.7.1/include/tvmet/CMakeLists.txt index 68d5a5f28..0194b0b6c 100644 --- a/tvmet-1.7.1/include/tvmet/CMakeLists.txt +++ b/tvmet-1.7.1/include/tvmet/CMakeLists.txt @@ -7,13 +7,6 @@ INCLUDE (CheckSysvMath) INCLUDE (CheckLongDouble) INCLUDE (CheckLongLong) -# the following are directories where stuff will be installed to -set(INCLUDE_INSTALL_DIR - "${CMAKE_INSTALL_PREFIX}/include/tvmet" - CACHE PATH - "The subdirectory to the header prefix" - FORCE) - FILE(GLOB tvmet_header_SRCS "*.h") CHECK_INCLUDE_FILES (sys/time.h TVMET_HAVE_SYS_TIME_H) @@ -26,6 +19,13 @@ CHECK_SYSV_MATH (TVMET_HAVE_SYSV_MATH) CHECK_LONG_DOUBLE (TVMET_HAVE_LONG_DOUBLE) CHECK_LONG_DOUBLE (TVMET_HAVE_LONG_LONG) +# the following are directories where stuff will be installed to +set(INCLUDE_INSTALL_DIR + "${CMAKE_INSTALL_PREFIX}/include/tvmet" + CACHE PATH + "The subdirectory to the header prefix" + FORCE) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${INCLUDE_INSTALL_DIR}/config.h) diff --git a/tvmet-1.7.1/include/tvmet/config.h.cmake b/tvmet-1.7.1/include/tvmet/config.h.cmake index bc951be6e..d07bd21ce 100644 --- a/tvmet-1.7.1/include/tvmet/config.h.cmake +++ b/tvmet-1.7.1/include/tvmet/config.h.cmake @@ -28,5 +28,7 @@ /* Define to 1 if you have the <unistd.h> header file. */ #cmakedefine TVMET_HAVE_UNISTD_H 1 +#define _tvmet_restrict __restrict__ + /* _INCLUDE_TVMET_CONFIG_H */ #endif diff --git a/tvmet-1.7.1/include/tvmet/tvmet.h b/tvmet-1.7.1/include/tvmet/tvmet.h index 7e66fefd7..abf7a7a0e 100644 --- a/tvmet-1.7.1/include/tvmet/tvmet.h +++ b/tvmet-1.7.1/include/tvmet/tvmet.h @@ -51,25 +51,6 @@ # include <tvmet/config/config-vc71.h> #endif - -// give up for these cases -#if !defined(TVMET_HAVE_MUTABLE) -# error "Your compiler doesn't support the mutable keyword! Giving up." -#endif - -#if !defined(TVMET_HAVE_TYPENAME) -# error "Your compiler doesn't support the typename keyword! Giving up." -#endif - -#if !defined(TVMET_HAVE_NAMESPACES) -# error "Your compiler doesn't support the namespace concept! Giving up." -#endif - -#if !defined(TVMET_HAVE_PARTIAL_SPECIALIZATION) -# error "Your compiler doesn't support partial specialization! Giving up." -#endif - - /* * other compiler specific stuff */ |