Skip to content

Commit 858217f

Browse files
committed
[C++]: SBE_JAR lookup based on specific expected version
1 parent 9f66a7f commit 858217f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ set(LIBSUFFIX "${CMAKE_STATIC_LIBRARY_SUFFIX}")
7373
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/binaries")
7474
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib")
7575

76-
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)
77-
if(SBE_JAR)
76+
set(SBE_JAR "${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs/sbe-all-${SBE_VERSION_TXT}.jar")
77+
if(EXISTS "${SBE_JAR}")
7878
message("latest SBE jar found: ${SBE_JAR}")
7979
else()
8080
message(FATAL_ERROR "could not find latest SBE jar in ${CMAKE_CURRENT_SOURCE_DIR}/sbe-all/build/libs")

sbe-tool/src/main/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ add_custom_target(
1919
java
2020
"-Dsbe.output.dir=${CMAKE_CURRENT_SOURCE_DIR}"
2121
"-Dsbe.target.language=CPP"
22-
"-jar" "${CMAKE_SOURCE_DIR}/sbe-all/build/libs/sbe-all-${SBE_VERSION_TXT}.jar"
22+
"-jar" "${SBE_JAR}"
2323
"../resources/sbe-ir.xml"
2424
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
2525
COMMENT "Generate IR codecs"

0 commit comments

Comments
 (0)