Commit 5acf1eb5 authored by Jørgen Lind's avatar Jørgen Lind
Browse files

Merge branch feature/jorgen.lind/rel1.0 with refs/heads/master into refs/merge-requests/185/train

parents 679c535f cf1cb738
Pipeline #2920 passed with stages
in 5 minutes and 43 seconds
......@@ -4,7 +4,7 @@ if(CCACHE_PROGRAM)
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}")
endif()
project(OpenVDS VERSION 0.9.0)
project(OpenVDS VERSION 1.0.0)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_CURRENT_SOURCE_DIR}/CMake")
......
include(UseJava)
set(OPENVDS_JAVA_VERSION 0.0.6)
#set(CMAKE_JAVA_COMPILE_FLAGS "-source" "1.8" "-target" "1.8")
set(GENERATED_JNI_HEADERS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cpp/generated)
#file(REMOVE_RECURSE ${GENERATED_JNI_HEADERS_DIR})
file(MAKE_DIRECTORY ${GENERATED_JNI_HEADERS_DIR})
......@@ -63,7 +59,7 @@ set(JAVA_SOURCE_FILES
# Enable JNI header generation for java >=8
add_jar(openvds-java
SOURCES ${JAVA_SOURCE_FILES}
VERSION ${OPENVDS_JAVA_VERSION}
VERSION ${CMAKE_PROJECT_VERSION}
GENERATE_NATIVE_HEADERS openvds-java-generated-headers DESTINATION ${GENERATED_JNI_HEADERS_DIR}
ENTRY_POINT OpenVdsDemo)
......@@ -87,7 +83,7 @@ set(JAVA_TEST_SOURCES_FILES
add_jar(openvds-java-test
SOURCES ${JAVA_TEST_SOURCES_FILES}
VERSION ${OPENVDS_JAVA_VERSION}
VERSION ${CMAKE_PROJECT_VERSION}
INCLUDE_JARS
${testng_SOURCE_FILE}
${BUILT_JAR_FILE}
......@@ -111,8 +107,10 @@ add_library(openvds-javacpp
cpp/src/VolumeDataPageAccessor.cpp
)
set_target_properties(openvds-javacpp PROPERTIES FOLDER java)
set_target_properties(openvds-javacpp PROPERTIES VERSION ${OPENVDS_JAVA_VERSION})
set_target_properties(openvds-javacpp PROPERTIES
FOLDER java
VERSION ${CMAKE_PROJECT_VERSION}
)
copyDllForTarget(openvds-javacpp)
target_include_directories(openvds-javacpp PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/include)
target_include_directories(openvds-javacpp PUBLIC ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
......
......@@ -30,6 +30,7 @@ pybind11_add_module(core MODULE SYSTEM
set_target_properties(core
PROPERTIES
VERSION ${CMAKE_PROJECT_VERSION}
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/..
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/..
VS_DEBUGGER_COMMAND "${Python3_EXECUTABLE}"
......
......@@ -18,7 +18,7 @@ except ImportError:
python_root_path = "-DPython3_ROOT_DIR={}".format(Path(sys.executable).parent.absolute().as_posix())
setup(
name="openvds",
version="0.1",
version="1.0",
description="Open-source implementation of the Volume Data Store (VDS) standard for fast random access to multi-dimensional volumetric data",
author='The Open Group / Bluware, Inc.',
license="Apache License, Version 2.0",
......
......@@ -248,8 +248,7 @@ target_link_libraries(openvds openvds_objects)
set_target_properties(openvds
PROPERTIES
FRAMEWORK ON
SOVERSION 0
VERSION 0.1.0
VERSION ${CMAKE_PROJECT_VERSION}
PUBLIC_HEADER "${EXPORTED_HEADER_FILES}"
#OUTPUT_NAME ${PROJECT_NAME}
)
......
......@@ -11,8 +11,7 @@ setWarningFlagsForTarget(segyutils)
set_target_properties(segyutils
PROPERTIES
FRAMEWORK ON
SOVERSION 0
VERSION 0.1.0
VERSION ${CMAKE_PROJECT_VERSION}
PUBLIC_HEADER "${EXPORTED_HEADER_FILES}"
#OUTPUT_NAME ${PROJECT_NAME}
)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment