Revision: 76060
http://sourceforge.net/p/brlcad/code/76060
Author: starseeker
Date: 2020-06-07 15:57:44 +0000 (Sun, 07 Jun 2020)
Log Message:
-----------
Include directory needs to be config aware in multiconfig builds
Modified Paths:
--------------
brlcad/trunk/regress/user/CMakeLists.txt
Modified: brlcad/trunk/regress/user/CMakeLists.txt
===================================================================
--- brlcad/trunk/regress/user/CMakeLists.txt 2020-06-07 15:54:04 UTC (rev
76059)
+++ brlcad/trunk/regress/user/CMakeLists.txt 2020-06-07 15:57:44 UTC (rev
76060)
@@ -20,8 +20,16 @@
# defintions or other magic specific to BRL-CAD's internal build.
add_executable(cad_user cad_user.c)
target_link_libraries(cad_user libged)
-target_include_directories(cad_user PUBLIC
"${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/brlcad")
+# Include only the folder with the build-output headers (this will be a
+# superset of what will be installed, but is the best available option without
+# performing an actual install step.)
+if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+ target_include_directories(cad_user PUBLIC
"${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${INCLUDE_DIR}/brlcad")
+else(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+ target_include_directories(cad_user PUBLIC
"${CMAKE_BINARY_DIR}/${INCLUDE_DIR}/brlcad")
+endif(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+
set_target_properties(cad_user PROPERTIES FOLDER "BRL-CAD Regression
Tests/user")
set(LOG_FILE "${CMAKE_CURRENT_BINARY_DIR}/regress-user.log")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
