From 4c14a258fefc4943de8f806f1be89401ceaaebf5 Mon Sep 17 00:00:00 2001
From: Paul Bakker
Date: Fri, 18 Jun 2010 22:54:05 +0000
Subject: [PATCH] - Fixed out of source build for tests with CMake
---
ChangeLog | 5 +++++
tests/CMakeLists.txt | 9 +++++----
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d06da3445..a9feb9ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,10 +4,15 @@ PolarSSL ChangeLog
Features
* Added support for SSL_EDH_RSA_AES_128_SHA and
SSL_EDH_RSA_CAMELLIA_128_SHA ciphersuites
+ * Added compile-time and run-time version information
Changes
* Made Makefile cleaner
+Bug fixes
+ * Fixed CMake out of source build for tests (found by
+ kkert)
+
= Version 0.13.1 released on 2010-03-24
Bug fixes
* Fixed Makefile in library that was mistakenly merged
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7c1fa7206..68589bcc2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,11 @@
function(add_test_suite suite_name)
add_custom_command(
OUTPUT test_suite_${suite_name}.c
- COMMAND scripts/generate_code.pl suites test_suite_${suite_name}
- DEPENDS scripts/generate_code.pl polarssl fct.h suites/helpers.function suites/test_suite_${suite_name}.function suites/test_suite_${suite_name}.data
-)
-
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_code.pl ${CMAKE_CURRENT_SOURCE_DIR}/suites test_suite_${suite_name}
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/generate_code.pl polarssl fct.h suites/helpers.function suites/test_suite_${suite_name}.function suites/test_suite_${suite_name}.data
+ )
+
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
add_executable(test_suite_${suite_name} test_suite_${suite_name}.c)
target_link_libraries(test_suite_${suite_name} polarssl)
add_test(${suite_name}-suite test_suite_${suite_name})