From 7bd1f738af94af92d5ef400062997a85a51b7dd7 Mon Sep 17 00:00:00 2001 From: Joakim Soderberg Date: Fri, 22 Feb 2013 09:28:06 +0800 Subject: [PATCH] BUGFIX: Fixed bug for installing test-apps for CMake. Appending to the TEST_APP_LIST variable function did not work from within the create_test_app function (It would create a function scope variable with the same name and discard it). We instead need to use a macro for this. The previous commit also removed the duplicate install for the test-apps (because we want all the install steps in one place in the file for clarity). That change made it obvious that the TEST_APP_LIST never gets populated. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c347cb..677472b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -449,7 +449,7 @@ if (NOT WITHOUT_TESTAPPS) # # Helper function for adding a test app. # - function(create_test_app TEST_NAME MAIN_SRC WIN32_SRCS WIN32_HDRS) + macro(create_test_app TEST_NAME MAIN_SRC WIN32_SRCS WIN32_HDRS) set(TEST_SRCS ${MAIN_SRC}) set(TEST_HDR) @@ -486,7 +486,7 @@ if (NOT WITHOUT_TESTAPPS) # Add to the list of tests. list(APPEND TEST_APP_LIST ${TEST_NAME}) - endfunction() + endmacro() if (WITH_SSL AND NOT USE_CYASSL) message("Searching for OpenSSL executable and dlls") -- 2.7.4