diff options
| author | Sven Göthel <[email protected]> | 2024-08-09 02:17:26 +0200 |
|---|---|---|
| committer | Sven Göthel <[email protected]> | 2024-08-09 02:17:26 +0200 |
| commit | 6cecefc62cba98fe81a98d62fa471be39c75c269 (patch) | |
| tree | 03a67a6a6ec2762541b21aae27614fd1a356add7 /trial | |
| parent | f1a3a29ecdcde3b8bc2a89814ca51dc1e9fe4a33 (diff) | |
Align to jaulib 1.3.3: Full cmake-presets usage w/ vscode support update; also use cmake target_{link|compile}_options instead of globalsv3.3.3
Example run scripts were also adopted.
Unit and trial tests passed on amd64 machine.
VSCode(ium) IDE integration manually tested.
Diffstat (limited to 'trial')
| -rw-r--r-- | trial/direct_bt/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | trial/java/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/trial/direct_bt/CMakeLists.txt b/trial/direct_bt/CMakeLists.txt index 97338efc..fbed8c0f 100644 --- a/trial/direct_bt/CMakeLists.txt +++ b/trial/direct_bt/CMakeLists.txt @@ -10,6 +10,8 @@ string( REPLACE ".cpp" "" TARGETS_IDIOMATIC_TRIALS "${SOURCES_IDIOMATIC_TRIALS}" foreach( name ${TARGETS_IDIOMATIC_TRIALS} ) add_executable(${name} ${name}.cpp) + target_compile_options(${name} PUBLIC ${direct_bt_CXX_FLAGS}) + target_link_options(${name} PUBLIC ${direct_bt_EXE_LINKER_FLAGS}) target_link_libraries(${name} direct_bt catch2) add_dependencies(${name} direct_bt catch2) add_test (NAME ${name} COMMAND sudo -E /sbin/capsh --caps=cap_net_raw,cap_net_admin+eip\ cap_setpcap,cap_setuid,cap_setgid+ep @@ -25,6 +27,8 @@ string( REPLACE ".cpp" "" TARGETS_IDIOMATIC_PROVOCATIONS "${SOURCES_IDIOMATIC_PR foreach( name ${TARGETS_IDIOMATIC_PROVOCATIONS} ) add_executable(${name} ${name}.cpp) + target_compile_options(${name} PUBLIC ${direct_bt_CXX_FLAGS}) + target_link_options(${name} PUBLIC ${direct_bt_EXE_LINKER_FLAGS}) target_link_libraries(${name} direct_bt catch2) add_dependencies(${name} direct_bt catch2) endforeach() diff --git a/trial/java/CMakeLists.txt b/trial/java/CMakeLists.txt index 105b6b90..df1a41c3 100644 --- a/trial/java/CMakeLists.txt +++ b/trial/java/CMakeLists.txt @@ -10,6 +10,8 @@ file(GLOB_RECURSE TEST_JAVA_SOURCES "*.java") file(GLOB_RECURSE TEST_JAVA_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "Test*.java") +set(CMAKE_JAVA_COMPILE_FLAGS ${direct_bt_JAVA_COMPILE_FLAGS}) + add_jar(direct_bt_trial ${TEST_JAVA_SOURCES} INCLUDE_JARS ${direct_bt_fat_jar_file} ${jaulib_base_jar_file} ${jaulib_test_jar_file} ${JUNIT_JAR} |