Skip to content

Commit e6f5503

Browse files
committed
fixes following PR review
1 parent ac1bef2 commit e6f5503

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
1919
set(CMAKE_CXX_EXTENSIONS OFF)
2020
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
2121

22-
# define installation directories
22+
# define directories
23+
# build-time binaries
24+
set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")
25+
# installation
2326
include(GNUInstallDirs)
2427
set(CMAKE_INSTALL_LIBDIR lib)
2528

@@ -225,7 +228,7 @@ target_include_directories(
225228

226229
# executable: infoLoggerServer
227230
if(MYSQL_FOUND)
228-
list(APPEND INFOLOGGERSERVER_SRC_EXTRA src/InfoLoggerDispatchSQL.cxx)
231+
add_definitions(-DWITH_MYSQL)
229232
endif()
230233
add_executable(
231234
infoLoggerServer
@@ -241,7 +244,7 @@ add_executable(
241244
src/infoLoggerMessageDecode.c
242245
src/InfoLoggerMessageHelper.cxx
243246
src/InfoLoggerMessageList.cxx
244-
${INFOLOGGERSERVER_SRC_EXTRA}
247+
$<$<BOOL:${MYSQL_FOUND}>:src/InfoLoggerDispatchSQL.cxx>
245248
)
246249
target_include_directories(
247250
infoLoggerServer
@@ -334,7 +337,6 @@ endif()
334337

335338

336339
# test programs
337-
# these are not unit tests, but interactive tools to help testing functionalities
338340
message("Generating test executables")
339341
enable_testing()
340342
set(TEST_SRCS
@@ -350,6 +352,7 @@ foreach (f ${TEST_SRCS})
350352
add_executable(${exe} ${f} ${INFOLOGGER_LIB_OBJECTS} $<TARGET_OBJECTS:objCommonTimer>)
351353
target_link_libraries(${exe} InfoLogger)
352354
target_include_directories(${exe} PRIVATE ${COMMON_STANDALONE_INCLUDE_DIRS})
355+
add_test(NAME ${test_name} COMMAND ${exe})
353356
endforeach()
354357

355358

0 commit comments

Comments
 (0)