Revision: 77476
http://sourceforge.net/p/brlcad/code/77476
Author: starseeker
Date: 2020-10-18 03:05:56 +0000 (Sun, 18 Oct 2020)
Log Message:
-----------
Ah, right - $<CONFIG> gets set even in single build configs, so we can't just
use it willy-nilly everywhere to cover both single and multibuild directory
structures. Blast. Will have to update all the logic again...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
Modified: brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
2020-10-17 16:41:45 UTC (rev 77475)
+++ brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
2020-10-18 03:05:56 UTC (rev 77476)
@@ -29,8 +29,13 @@
perplex_template.c
)
- set(LEMON_TEMPLATE
"${CMAKE_BINARY_DIR}/$<CONFIG>/${DATA_DIR}/lemon/lempar.c" CACHE PATH "lemon
template" FORCE)
- set(PERPLEX_TEMPLATE
"${CMAKE_BINARY_DIR}/$<CONFIG>/${DATA_DIR}/perplex/perplex_template.c" CACHE
PATH "perplex template" FORCE)
+ if (CMAKE_CONFIGURATION_TYPES)
+ set(LEMON_TEMPLATE
"${CMAKE_BINARY_DIR}/$<CONFIG>/${DATA_DIR}/lemon/lempar.c" CACHE PATH "lemon
template" FORCE)
+ set(PERPLEX_TEMPLATE
"${CMAKE_BINARY_DIR}/$<CONFIG>/${DATA_DIR}/perplex/perplex_template.c" CACHE
PATH "perplex template" FORCE)
+ else (CMAKE_CONFIGURATION_TYPES)
+ set(LEMON_TEMPLATE "${CMAKE_BINARY_DIR}/${DATA_DIR}/lemon/lempar.c" CACHE
PATH "lemon template" FORCE)
+ set(PERPLEX_TEMPLATE
"${CMAKE_BINARY_DIR}/${DATA_DIR}/perplex/perplex_template.c" CACHE PATH
"perplex template" FORCE)
+ endif (CMAKE_CONFIGURATION_TYPES)
set(LEMON_EXECUTABLE perplex_lemon CACHE STRING "lemon" FORCE)
set(RE2C_EXECUTABLE perplex_re2c CACHE STRING "re2c" FORCE)
set(PERPLEX_EXECUTABLE perplex_perplex CACHE STRING "perplex" FORCE)
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
