Skip to content

Commit

Permalink
Merge pull request #133 from Fraunhofer-IIS/132-split-cmake-of-libjap…
Browse files Browse the repository at this point in the history
…i-and-test-build

132 split cmake of libjapi and test build
  • Loading branch information
Michael-M-Baron authored Aug 9, 2024
2 parents 8d3a158 + 1c0f0a9 commit 36ea184
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.14)
cmake_minimum_required(VERSION 3.6)

project(libjapi VERSION 0.4)
set(SOVERSION 1)
Expand Down Expand Up @@ -67,6 +67,7 @@ endif(DOXYGEN_FOUND)
# Create unit test excecutable #
option(LIBJAPI_ENABLE_TESTING "Enable testing with googletest" ON)
if(LIBJAPI_ENABLE_TESTING)
cmake_minimum_required(VERSION 3.14)
enable_testing()

# Include GoogleTest in the project
Expand Down Expand Up @@ -105,4 +106,4 @@ if(LIBJAPI_ENABLE_TESTING)
append_coverage_compiler_flags()
setup_target_for_coverage_lcov(NAME coverage EXECUTABLE testsuite)
endif()
endif(LIBJAPI_ENABLE_TESTING)
endif(LIBJAPI_ENABLE_TESTING)
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Prebuild packages for CentOS 7 can be downloaded from the [latest package Action

### Prerequisites
* [json-c](https://github.com/json-c/json-c)
* [cmake version 3.6](https://cmake.org/)
* [cmake version 3.6](https://cmake.org/) for libjapi build
* [cmake version 3.14](https://cmake.org/) for libjapi test-framework build

### Installation
Clone the git repository and it's submodules:
Expand All @@ -38,7 +39,7 @@ A Makefile is generated. Run 'make' to build the libjapi libraries.

$ make

A shared and a static library is built. Tests are built by default. They can be disabled using the command `cmake -DLIBJAPI_ENABLE_TESTING=FALSE ../` variable.
A shared and a static library is built. Tests are built by default. They can be disabled using the command `cmake -DLIBJAPI_ENABLE_TESTING=OFF ../` variable.

To run the internal tests run

Expand Down

0 comments on commit 36ea184

Please sign in to comment.