1
0
miroir de https://github.com/quitesimpleorg/qsmaddy.git synchronisé 2026-02-02 06:20:31 +01:00

Improved cmake setup

Cette révision appartient à :
Petra Baranski
2020-10-04 19:02:39 +02:00
Parent ba5cb5d6c5
révision 348aa81607
3 fichiers modifiés avec 9 ajouts et 6 suppressions

Voir le fichier

@@ -28,5 +28,5 @@ script:
- mkdir tmp - mkdir tmp
- cd tmp - cd tmp
- cmake .. - cmake ..
- make - make -j4
- ../build/MaddyTests - ../build/MaddyTests

Voir le fichier

@@ -60,10 +60,9 @@ add_subdirectory(libs)
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
include_directories( add_library(maddy INTERFACE)
${LIBS_INCLUDE_DIRS} target_include_directories(maddy INTERFACE
${MADDY_INCLUDE_DIR} ${MADDY_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/tests
) )
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@@ -73,5 +72,9 @@ add_executable(
${MADDY_TESTS_FILES} ${MADDY_TESTS_FILES}
${CMAKE_CURRENT_SOURCE_DIR}/tests/main.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tests/main.cpp
) )
target_link_libraries(MaddyTests gmock_main) target_include_directories(MaddyTests PUBLIC
${LIBS_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/tests
)
target_link_libraries(MaddyTests maddy gmock_main)
add_test(MaddyTests ${CMAKE_CURRENT_SOURCE_DIR}/build/MaddyTests) add_test(MaddyTests ${CMAKE_CURRENT_SOURCE_DIR}/build/MaddyTests)

Voir le fichier

@@ -1,4 +1,4 @@
Copyright 2017, 2018, 2019 M. Petra Baranski Copyright 2017, 2018, 2019, 2020 M. Petra Baranski
Permission is hereby granted, free of charge, to any person obtaining a copy of Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in this software and associated documentation files (the "Software"), to deal in