From 086663ef4added735a90c53988459665da66aed5 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 7 Oct 2018 16:42:20 -0600 Subject: [PATCH] CMake: Use $ when referencing paths in build directory This prevents CMake from including them in exported targets, which allows the exported targets to be installed. --- dtool/src/dtoolbase/CMakeLists.txt | 4 ++-- dtool/src/prc/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dtool/src/dtoolbase/CMakeLists.txt b/dtool/src/dtoolbase/CMakeLists.txt index ebcc827fb5..43a4013e5e 100644 --- a/dtool/src/dtoolbase/CMakeLists.txt +++ b/dtool/src/dtoolbase/CMakeLists.txt @@ -87,8 +87,8 @@ add_component_library(p3dtoolbase NOINIT SYMBOL BUILDING_DTOOL_DTOOLBASE ${P3DTOOLBASE_HEADERS} ${P3DTOOLBASE_SOURCES}) # Help other libraries find the autogenerated headers target_include_directories(p3dtoolbase PUBLIC - ${CMAKE_CURRENT_BINARY_DIR} - ${PROJECT_BINARY_DIR}/include/${CMAKE_CFG_INTDIR}) + $ + $) target_link_libraries(p3dtoolbase PKG::EIGEN) target_interrogate(p3dtoolbase ${P3DTOOLBASE_SOURCES} EXTENSIONS ${P3DTOOLBASE_IGATEEXT}) diff --git a/dtool/src/prc/CMakeLists.txt b/dtool/src/prc/CMakeLists.txt index 9c74352017..0d834afd62 100644 --- a/dtool/src/prc/CMakeLists.txt +++ b/dtool/src/prc/CMakeLists.txt @@ -72,7 +72,7 @@ composite_sources(p3prc P3PRC_SOURCES) add_component_library(p3prc NOINIT SYMBOL BUILDING_DTOOL_PRC ${P3PRC_HEADERS} ${P3PRC_SOURCES}) -target_include_directories(p3prc PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) +target_include_directories(p3prc PUBLIC $) target_link_libraries(p3prc p3dtool PKG::OPENSSL) target_interrogate(p3prc ALL EXTENSIONS ${P3PRC_IGATEEXT})