aboutsummaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2012-10-07 11:10:27 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-10-07 11:10:27 +0200
commitc81010e2f7e560081d78d15e54789af45c0a4999 (patch)
treebd38f40fe2a56388f1373454d72f8186aa003b25 /cmake
parentc078e36219fc23aed8fff9b5efce33e09e177e20 (diff)
downloadlibssh-c81010e2f7e560081d78d15e54789af45c0a4999.tar.gz
libssh-c81010e2f7e560081d78d15e54789af45c0a4999.tar.xz
libssh-c81010e2f7e560081d78d15e54789af45c0a4999.zip
test: Use cmocka instead of cmockery.
cmocka is the successor of cmockery. http://git.cryptomilk.org/projects/cmocka.git/
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/AddCMockaTest.cmake (renamed from cmake/Modules/AddCMockeryTest.cmake)4
-rw-r--r--cmake/Modules/FindCMocka.cmake49
-rw-r--r--cmake/Modules/FindCMockery.cmake62
3 files changed, 51 insertions, 64 deletions
diff --git a/cmake/Modules/AddCMockeryTest.cmake b/cmake/Modules/AddCMockaTest.cmake
index 33a20b39..b2d1ca8a 100644
--- a/cmake/Modules/AddCMockeryTest.cmake
+++ b/cmake/Modules/AddCMockaTest.cmake
@@ -16,8 +16,8 @@ if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
set(CMAKE_EXEC_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags")
endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
-function (ADD_CMOCKERY_TEST _testName _testSource)
+function (ADD_CMOCKA_TEST _testName _testSource)
add_executable(${_testName} ${_testSource})
target_link_libraries(${_testName} ${ARGN})
add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName})
-endfunction (ADD_CMOCKERY_TEST)
+endfunction (ADD_CMOCKA_TEST)
diff --git a/cmake/Modules/FindCMocka.cmake b/cmake/Modules/FindCMocka.cmake
new file mode 100644
index 00000000..2dd9fc5f
--- /dev/null
+++ b/cmake/Modules/FindCMocka.cmake
@@ -0,0 +1,49 @@
+# - Try to find CMocka
+# Once done this will define
+#
+# CMOCKA_ROOT_DIR - Set this variable to the root installation of CMocka
+#
+# Read-Only variables:
+# CMOCKA_FOUND - system has CMocka
+# CMOCKA_INCLUDE_DIR - the CMocka include directory
+# CMOCKA_LIBRARIES - Link these to use CMocka
+# CMOCKA_DEFINITIONS - Compiler switches required for using CMocka
+#
+#=============================================================================
+# Copyright (c) 2011-2012 Andreas Schneider <asn@cryptomilk.org>
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+#
+
+find_path(CMOCKA_INCLUDE_DIR
+ NAMES
+ cmocka.h
+ PATHS
+ ${CMOCKA_ROOT_DIR}/include
+)
+
+find_library(CMOCKA_LIBRARY
+ NAMES
+ cmocka
+ PATHS
+ ${CMOCKA_ROOT_DIR}/include
+)
+
+if (CMOCKA_LIBRARY)
+ set(CMOCKA_LIBRARIES
+ ${CMOCKA_LIBRARIES}
+ ${CMOCKA_LIBRARY}
+ )
+endif (CMOCKA_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CMocka DEFAULT_MSG CMOCKA_LIBRARIES CMOCKA_INCLUDE_DIR)
+
+# show the CMOCKA_INCLUDE_DIR and CMOCKA_LIBRARIES variables only in the advanced view
+mark_as_advanced(CMOCKA_INCLUDE_DIR CMOCKA_LIBRARIES)
diff --git a/cmake/Modules/FindCMockery.cmake b/cmake/Modules/FindCMockery.cmake
deleted file mode 100644
index 7cd4bdc1..00000000
--- a/cmake/Modules/FindCMockery.cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-# - Try to find CMockery
-# Once done this will define
-#
-# CMOCKERY_ROOT_DIR - Set this variable to the root installation of CMockery
-#
-# Read-Only variables:
-# CMOCKERY_FOUND - system has CMockery
-# CMOCKERY_INCLUDE_DIR - the CMockery include directory
-# CMOCKERY_LIBRARIES - Link these to use CMockery
-# CMOCKERY_DEFINITIONS - Compiler switches required for using CMockery
-#
-#=============================================================================
-# Copyright (c) 2011-2012 Andreas Schneider <asn@cryptomilk.org>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-#
-
-set(_OPENSSL_ROOT_PATHS
- "C:/OpenSSL/"
- $ENV{PROGRAMFILES}/cmockery/include
-)
-
-find_path(OPENSSL_ROOT_DIR
- NAMES
- include/google/cmockery.h
- PATHS
- ${_OPENSSL_ROOT_PATHS}
-)
-mark_as_advanced(OPENSSL_ROOT_DIR)
-
-find_path(CMOCKERY_INCLUDE_DIR
- NAMES
- google/cmockery.h
- PATHS
- ${CMOCKERY_ROOT_DIR}/include
-)
-
-find_library(CMOCKERY_LIBRARY
- NAMES
- cmockery
- PATHS
- ${CMOCKERY_ROOT_DIR}/include
-)
-
-if (CMOCKERY_LIBRARY)
- set(CMOCKERY_LIBRARIES
- ${CMOCKERY_LIBRARIES}
- ${CMOCKERY_LIBRARY}
- )
-endif (CMOCKERY_LIBRARY)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(CMockery DEFAULT_MSG CMOCKERY_LIBRARIES CMOCKERY_INCLUDE_DIR)
-
-# show the CMOCKERY_INCLUDE_DIR and CMOCKERY_LIBRARIES variables only in the advanced view
-mark_as_advanced(CMOCKERY_INCLUDE_DIR CMOCKERY_LIBRARIES)