From 858217fc919e680435324802c1973b8cb523d41a Mon Sep 17 00:00:00 2001 From: Vlad Didenko Date: Wed, 31 Aug 2016 21:27:31 -0500 Subject: [PATCH] [C++]: SBE_JAR lookup based on specific expected version --- CMakeLists.txt | 4 ++-- sbe-tool/src/main/cpp/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a6385ed39..1632dd2379 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,8 +73,8 @@ set(LIBSUFFIX "${CMAKE_STATIC_LIBRARY_SUFFIX}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/binaries") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib") -file(GLOB SBE_JAR ${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs/sbe-all-*-SNAPSHOT.jar ${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs/sbe-all-[0-9].[0-9].[0-9].jar) -if(SBE_JAR) +set(SBE_JAR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs/sbe-all-${SBE_VERSION_TXT}.jar") +if(EXISTS "${SBE_JAR}") message("latest SBE jar found: ${SBE_JAR}") else() message(FATAL_ERROR "could not find latest SBE jar in ${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs") diff --git a/sbe-tool/src/main/cpp/CMakeLists.txt b/sbe-tool/src/main/cpp/CMakeLists.txt index c3b9f47e5d..9ca73ea969 100644 --- a/sbe-tool/src/main/cpp/CMakeLists.txt +++ b/sbe-tool/src/main/cpp/CMakeLists.txt @@ -19,7 +19,7 @@ add_custom_target( java "-Dsbe.output.dir=${CMAKE_CURRENT_SOURCE_DIR}" "-Dsbe.target.language=CPP" - "-jar" "${CMAKE_SOURCE_DIR}/sbe-all/build/libs/sbe-all-${SBE_VERSION_TXT}.jar" + "-jar" "${SBE_JAR}" "../resources/sbe-ir.xml" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMENT "Generate IR codecs"