rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Always use the project version

Browse Source 
Don't duplicated versions so we avoid the problem of missing one
instance to be updated.
This commit is contained in:
Rodrigo Arias 2023-07-07 10:42:40 +02:00
parent e2119f77d6
commit 48df02f102
6 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC) # Copyright (c) 2021-2023 Barcelona Supercomputing Center (BSC)
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) configure_file("ovni.h.in" "${CMAKE_CURRENT_BINARY_DIR}/ovni.h")

2
include/ovni.h → include/ovni.h.in
View File

@ -34,7 +34,7 @@ typedef struct json_value_t JSON_Value;
#define OVNI_STREAM_EXT ".obs" #define OVNI_STREAM_EXT ".obs"
/* Follow https://semver.org rules for versioning */ /* Follow https://semver.org rules for versioning */
#define OVNI_LIB_VERSION "1.2.0" #define OVNI_LIB_VERSION "@PROJECT_VERSION@"
/* ----------------------- common ------------------------ */ /* ----------------------- common ------------------------ */

3
src/emu/CMakeLists.txt
View File

@ -56,6 +56,7 @@ add_library(emu STATIC
kernel/setup.c kernel/setup.c
kernel/event.c kernel/event.c
) )
target_link_libraries(emu ovni-static)
add_executable(ovniemu ovniemu.c) add_executable(ovniemu ovniemu.c)
target_link_libraries(ovniemu emu parson-static ovni-static) target_link_libraries(ovniemu emu parson-static ovni-static)
@ -78,7 +79,7 @@ if(USE_MPI)
endif() endif()
find_package(MPI REQUIRED) find_package(MPI REQUIRED)
add_executable(ovnisync ovnisync.c) add_executable(ovnisync ovnisync.c)
target_link_libraries(ovnisync m MPI::MPI_C) target_link_libraries(ovnisync ovni-static m MPI::MPI_C)
install(TARGETS ovnisync) install(TARGETS ovnisync)
else() else()
message(STATUS "Disabling ovnisync as MPI is disabled") message(STATUS "Disabling ovnisync as MPI is disabled")

10
src/rt/CMakeLists.txt
View File

@ -5,14 +5,14 @@ include_directories("${CMAKE_SOURCE_DIR}/src/include")
add_library(ovni SHARED ovni.c) add_library(ovni SHARED ovni.c)
target_link_libraries(ovni parson common) target_link_libraries(ovni parson common)
target_include_directories(ovni PUBLIC "${CMAKE_SOURCE_DIR}/include") target_include_directories(ovni PUBLIC "${CMAKE_BINARY_DIR}/include")
set_target_properties(ovni PROPERTIES set_target_properties(ovni PROPERTIES
VERSION 1.2.0 VERSION ${PROJECT_VERSION}
SOVERSION 1 SOVERSION ${PROJECT_VERSION_MAJOR}
PUBLIC_HEADER "${CMAKE_SOURCE_DIR}/include/ovni.h") PUBLIC_HEADER "${CMAKE_BINARY_DIR}/include/ovni.h")
add_library(ovni-static STATIC ovni.c) add_library(ovni-static STATIC ovni.c)
target_link_libraries(ovni-static parson-static common-static) target_link_libraries(ovni-static parson-static common-static)
target_include_directories(ovni-static PUBLIC "${CMAKE_SOURCE_DIR}/include") target_include_directories(ovni-static PUBLIC "${CMAKE_BINARY_DIR}/include")
install(TARGETS ovni) install(TARGETS ovni)

2
test/emu/common/CMakeLists.txt
View File

@ -8,4 +8,4 @@ target_include_directories(instr-static
PRIVATE "${CMAKE_SOURCE_DIR}/src/include" PRIVATE "${CMAKE_SOURCE_DIR}/src/include"
PRIVATE "${CMAKE_SOURCE_DIR}/include" PRIVATE "${CMAKE_SOURCE_DIR}/include"
) )
target_link_libraries(ovni-static parson-static common-static) target_link_libraries(instr-static ovni-static parson-static common-static)

2
test/macros.cmake
View File

@ -115,7 +115,7 @@ function(ovni_test source)
add_executable("${OVNI_TEST_NAME}" "${OVNI_TEST_SOURCE}") add_executable("${OVNI_TEST_NAME}" "${OVNI_TEST_SOURCE}")
target_link_libraries("${OVNI_TEST_NAME}" PRIVATE ovni emu) target_link_libraries("${OVNI_TEST_NAME}" PRIVATE ovni-static emu)
set(driver "${OVNI_TEST_SOURCE_DIR}/ovni-driver.sh") set(driver "${OVNI_TEST_SOURCE_DIR}/ovni-driver.sh")