Merge branch 'develop'

abdes · Sep 19, 2022 · a4c8b43 · a4c8b43
2 parents d4a3a87 + c6d5e34
commit a4c8b43
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/cmake/AsapInstall.cmake b/cmake/AsapInstall.cmake
@@ -85,7 +85,7 @@ if(${META_PROJECT_ID}_INSTALL)
 
   # Install generated header files
   install(
-    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_NAME}
+    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/${META_PROJECT_ID_LOWER}
     DESTINATION ${ASAP_INSTALL_INCLUDE}
     COMPONENT ${dev})
 

diff --git a/cmake/CompileDefinitions.cmake b/cmake/CompileDefinitions.cmake
@@ -11,7 +11,7 @@ include_guard(GLOBAL)
 # ------------------------------------------------------------------------------
 
 function(asap_set_compile_definitions target)
-  set(argOption)
+  set(argOption "NO_CONTRACT")
   set(argSingle "")
   set(argMulti "ADD" "REMOVE")
 
@@ -53,7 +53,9 @@ function(asap_set_compile_definitions target)
   # If linking against asap_contract, set the contract mode based on the build
   # type. Use generator expressions only, do not check for CMAKE_BUILD_TYPE
   # which is not friendly with multi-config generators.
-  if(TARGET asap_contract)
+  #
+  # Do not add this definition if we are testing asap-_contract
+  if(TARGET asap_contract AND NOT ASAP_CONTRACT_TESTING)
     if(NOT DEFINED OPTION_CONTRACT_MODE)
       target_compile_definitions(
         ${target}

diff --git a/tools/version-info/CMakeLists.txt b/tools/version-info/CMakeLists.txt
@@ -48,10 +48,12 @@ asap_add_executable(${MODULE_TARGET_NAME} WARNING SOURCES "src/main.cpp")
 
 target_compile_features(${MODULE_TARGET_NAME} PUBLIC cxx_constexpr)
 
+target_compile_features(${MODULE_TARGET_NAME} PUBLIC cxx_constexpr)
+cmake_path(SET version_include_dir ${CMAKE_CURRENT_BINARY_DIR}/../../include
+           NORMALIZE)
 target_include_directories(
   ${MODULE_TARGET_NAME}
-  PUBLIC $<INSTALL_INTERFACE:include>
-         $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
+  PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${version_include_dir}>
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 # ------------------------------------------------------------------------------