diff --git a/CMakeLists.txt b/CMakeLists.txt index 605d99828c3eec20b1a9cd85aea2d7a25cc3f6fb..859c8048012f730ada53de5d85ce03a9d04defc6 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 9df01395a73c854e094f29153bcffba9e22e36c1..97029ac6b3aa5c66c788560927684171059f4120 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}>)