@@ -2,44 +2,18 @@ project(grive)
22
33cmake_minimum_required (VERSION 2.8 )
44
5- include ( FindOpenSSL )
5+ set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} " ${CMAKE_SOURCE_DIR} /cmake/Modules/" )
66
7- ###############################################################################
8- # finding cppunit
9- ###############################################################################
10- find_path ( CPPUNIT_INCLUDE_DIR cppunit/TestFixture.h /usr/include
11- /usr/local/include
12- ${CPPUNIT_PREFIX} /include )
13- find_library ( CPPUNIT_LIBRARY_DEBUG NAMES cppunit cppunit_dll
14- PATHS /usr/lib
15- /usr/lib64
16- /usr/local/lib
17- /usr/local/lib64
18- ${CPPUNIT_PREFIX} /lib
19- PATH_SUFFIXES debug )
7+ find_package (OpenSSL REQUIRED )
8+ find_package (CppUnit REQUIRED )
9+ find_package (JSONC REQUIRED )
10+ find_package (CURL REQUIRED )
2011
21- find_library ( CPPUNIT_LIBRARY_RELEASE NAMES cppunit cppunit_dll
22- PATHS /usr/lib
23- /usr/lib64
24- /usr/local/lib
25- /usr/local/lib64
26- ${CPPUNIT_PREFIX} /lib
27- PATH_SUFFIXES release )
28-
29- set ( CPPUNIT_LIBRARY debug ${CPPUNIT_LIBRARY_DEBUG}
30- optimized ${CPPUNIT_LIBRARY_RELEASE} )
31-
32- if ( CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY )
33- message ( STATUS "found cppunit" )
34- set ( CPPUNIT_FOUND TRUE )
35- set ( OPT_INCS ${CPPUNIT_INCLUDE_DIR} )
36- endif ( CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY )
37-
38- ###############################################################################
12+ set ( OPT_INCS ${CPPUNIT_INCLUDE_DIR} )
3913
4014include_directories (
4115 ${grive_SOURCE_DIR} /src
42- ${OPT_INCS}
16+ ${OPT_INCS}
4317)
4418
4519add_executable ( grive
@@ -56,24 +30,24 @@ add_executable( grive
5630)
5731
5832target_link_libraries ( grive
59- curl
60- json
33+ ${CURL_LIBRARIES}
34+ ${JSONC_LIBRARY}
6135 ${OPENSSL_LIBRARIES}
6236)
6337
64- if ( CPPUNIT_FOUND )
38+ IF ( CPPUNIT_FOUND )
6539
66- add_executable ( unittest
67- test /UnitTest.cc
68- src/util/DateTime.cc
69- test /util/DateTimeTest.cc
70- test /util/FunctionTest.cc
71- )
40+ add_executable ( unittest
41+ test /UnitTest.cc
42+ src/util/DateTime.cc
43+ test /util/DateTimeTest.cc
44+ test /util/FunctionTest.cc
45+ )
7246
73- target_link_libraries ( unittest
74- ${CPPUNIT_LIBRARY}
75- )
47+ target_link_libraries ( unittest
48+ ${CPPUNIT_LIBRARY}
49+ )
7650
77- else ( CPPUNIT_FOUND )
51+ ELSE ( CPPUNIT_FOUND )
7852 message ( STATUS "skip building unittest" )
79- endif ( CPPUNIT_FOUND )
53+ ENDIF ( CPPUNIT_FOUND )
0 commit comments