From 1dbdd9434f23fe7928f9b883ef0ed2a65d5ace79 Mon Sep 17 00:00:00 2001
From: Jakob Olsson <jakob.olsson@iopsys.eu>
Date: Wed, 2 Oct 2019 15:35:50 +0200
Subject: [PATCH] compile as shared library
---
CMakeLists.txt | 6 ++++--
test/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 605d998..859c804 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,9 @@ SET(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} ${DEFAULT_FLAGS}
#create executable
FILE(GLOB SOURCES "*.c" "*.h")
-ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES})
+#ADD_EXECUTABLE(${PROJECT_NAME} ${SOURCES})
+
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${SOURCES})
#link libraries
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules")
@@ -43,7 +45,7 @@ ENDIF()
IF(ENABLE_BUILD_TESTS)
FIND_PACKAGE(CMocka)
if(CMOCKA_FOUND)
- ADD_LIBRARY(${PROJECT_NAME}-api SHARED ${SOURCES})
+ #ADD_LIBRARY(${PROJECT_NAME}-api SHARED ${SOURCES})
MESSAGE("-- Building tests")
ENABLE_TESTING()
ADD_SUBDIRECTORY(test)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9df0139..97029ac 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,7 +11,7 @@ FOREACH(test_name IN LISTS api_tests)
TARGET_LINK_LIBRARIES(
${test_name}
${CMOCKA_LIBRARIES}
- json-editor-api
+ json-editor
${JSON_LIBRARIES}
)
ADD_TEST(NAME ${test_name} COMMAND $<TARGET_FILE:${test_name}>)
--
GitLab