Merge branch 'dev' of github.com:giancarlopro/framebot into dev

CMakeLists.txt

@@ -3,6 +3,8 @@ project(FramebotFramework)
 
 find_package(OpenSSL REQUIRED)
 
+set(curl /usr/local/lib/libcurl.so)
+
 add_subdirectory(src)
 add_subdirectory(test)
 add_subdirectory(examples)

examples/CMakeLists.txt

@@ -4,4 +4,4 @@ project(ExampleBots)
 include_directories (${PROJECT_SOURCE_DIR}/../include)
 
 add_executable(echo echo.c)
-target_link_libraries(echo jansson libcurl.so framebot)
+target_link_libraries(echo jansson ${curl} framebot)

src/CMakeLists.txt

@@ -13,10 +13,10 @@ include_directories (${PROJECT_SOURCE_DIR}/../include)
 
 if(CMAKE_SYSTEM_NAME STREQUAL Linux)
 	add_library(framebot_ SHARED framebot.c memory.c objects.c json.c network.c format.c util.c)
-	target_link_libraries(framebot_ jansson libcurl.so)
+	target_link_libraries(framebot_ jansson ${curl})
 
 	add_library(framebot STATIC framebot.c memory.c objects.c json.c network.c format.c util.c)
-	target_link_libraries(framebot jansson libcurl.so)
+	target_link_libraries(framebot jansson ${curl})
 
 	install(TARGETS framebot_ LIBRARY DESTINATION lib)
 	install(TARGETS framebot ARCHIVE DESTINATION lib)

test/CMakeLists.txt

@@ -29,19 +29,19 @@ add_executable(sendmessage test_sendmessage.c)
 add_executable(all_api test_api.c)
 
 if (CMAKE_SYSTEM_NAME STREQUAL Linux)
-	target_link_libraries(test_lib jansson libcurl.so framebot)
-	target_link_libraries(libtest jansson libcurl.so framebot)
-	target_link_libraries(update jansson libcurl.so framebot)
-	target_link_libraries(file jansson libcurl.so framebot)
-	target_link_libraries(userprofilephotos jansson libcurl.so framebot)
-	target_link_libraries(sendphotos jansson libcurl.so framebot)
-	target_link_libraries(sendaudio jansson libcurl.so framebot)
-	target_link_libraries(senddocument jansson libcurl.so framebot)
-	target_link_libraries(sendvideo jansson libcurl.so framebot)
-	target_link_libraries(sendvoice jansson libcurl.so framebot)
-	target_link_libraries(sendvideonote jansson libcurl.so framebot)
-	target_link_libraries(sendmessage jansson libcurl.so framebot)
-	target_link_libraries(all_api jansson libcurl.so framebot)
+	target_link_libraries(test_lib jansson ${curl} framebot)
+	target_link_libraries(libtest jansson ${curl} framebot)
+	target_link_libraries(update jansson ${curl} framebot)
+	target_link_libraries(file jansson ${curl} framebot)
+	target_link_libraries(userprofilephotos jansson ${curl} framebot)
+	target_link_libraries(sendphotos jansson ${curl} framebot)
+	target_link_libraries(sendaudio jansson ${curl} framebot)
+	target_link_libraries(senddocument jansson ${curl} framebot)
+	target_link_libraries(sendvideo jansson ${curl} framebot)
+	target_link_libraries(sendvoice jansson ${curl} framebot)
+	target_link_libraries(sendvideonote jansson ${curl} framebot)
+	target_link_libraries(sendmessage jansson ${curl} framebot)
+	target_link_libraries(all_api jansson ${curl} framebot)
 endif (CMAKE_SYSTEM_NAME STREQUAL Linux)
 
 if (WIN32)