Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Include config.h correctly

  • Loading branch information...
commit 868637c4164ee0024a890f21deb7df7185128a89 1 parent d6fa40e
thomasmoelhave authored
3  CMakeLists.txt
View
@@ -19,7 +19,7 @@ check_include_files("sys/unistd.h" TPIE_HAVE_SYS_UNISTD_H)
check_include_files("sys/async.h" TPIE_HAVE_LIBAIO)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/tpie)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tpie/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tpie/config.h)
add_subdirectory(tpie)
@@ -31,3 +31,4 @@ option(COMPILE_TEST "Compile test programs" ON)
if (COMPILE_TEST)
add_subdirectory(test)
endif (COMPILE_TEST)
+
2  test/app_config.h
View
@@ -11,7 +11,7 @@
#define _APP_CONFIG_H
// Get the configuration as set up by the TPIE configure script.
-#include <config.h>
+#include <tpie/config.h>
// <><><><><><><><><><><><><><><><><><><><><><> //
// <><><><><><><> Developer use <><><><><><><> //
1  tpie/CMakeLists.txt
View
@@ -65,7 +65,6 @@ set (OTHER_HEADERS
bit_matrix.h
b_vector.h
comparator.h
- config.h
config.h.cmake
cpu_timer.h
internal_sort.h
2  tpie/lib_config.h
View
@@ -8,7 +8,7 @@
#ifndef _LIB_CONFIG_H
#define _LIB_CONFIG_H
-#include <config.h>
+#include <tpie/config.h>
// Use logs if requested.
#if TP_LOG_LIB
2  tpie/portability.h
View
@@ -10,7 +10,7 @@
#ifndef _PORTABILITY_H
#define _PORTABILITY_H
-#include <config.h>
+#include <tpie/config.h>
// The following wil cause TPIE_OS_SIZE_T to be a 32-bit integer!
#define _TPIE_SMALL_MAIN_MEMORY
2  tpie/priority_queue.h
View
@@ -1,7 +1,7 @@
#ifndef _TPIE_PRIORITY_QUEUE_H_
#define _TPIE_PRIORITY_QUEUE_H_
-#include <config.h>
+#include <tpie/config.h>
#include "portability.h"
#include "ami.h"
#include "tpie_log.h"
2  tpie/stream.h
View
@@ -18,7 +18,7 @@
#include <tpie/portability.h>
// Include the configuration header.
-#include <config.h>
+#include <tpie/config.h>
// Get the error codes.
#include <tpie/err.h>
Please sign in to comment.
Something went wrong with that request. Please try again.