Revision: 77482
http://sourceforge.net/p/brlcad/code/77482
Author: starseeker
Date: 2020-10-18 15:19:10 +0000 (Sun, 18 Oct 2020)
Log Message:
-----------
Use variable CMAKE_BINARY_ROOT - still have some problem with Ninja
Multi-Config Release config where step-g crashes, but plain Ninja now builds in
Release config...
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-18 14:08:58 UTC (rev 77481)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-18 15:19:10 UTC (rev 77482)
@@ -104,7 +104,7 @@
set(ALL_TOUT ${ALL_TOUT} ${TOUT})
if (NOT E_NOINSTALL)
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${dir}/${bpf}" DESTINATION
"${dir}/")
+ install(FILES "${CMAKE_BINARY_ROOT}/${dir}/${bpf}" DESTINATION "${dir}/")
if (E_FIXPATH)
# Note - proper quoting for install(CODE) is extremely important for
CPack, see
# https://stackoverflow.com/a/48487133
@@ -152,10 +152,17 @@
else(NOT CMAKE_CONFIGURATION_TYPES)
+ # If no config is set for multiconfig, default to Debug
+ set_target_properties(${etarg} PROPERTIES
+ IMPORTED_NO_SONAME TRUE
+ IMPORTED_LOCATION_NOCONFIG
"${CMAKE_BINARY_DIR}/Debug/${REL_DIR}/${LINK_TARGET}"
+ IMPORTED_SONAME_NOCONFIG "${LINK_TARGET}"
+ )
+
foreach(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER "${CFG_TYPE}" CFG_TYPE_UPPER)
- # The config variables are the ones set in this mode.
+ # The config variables need to be set in this mode.
if("${CFG_TYPE_UPPER}" STREQUAL "DEBUG" AND ET_LINK_TARGET_DEBUG)
set(C_LINK_TARGET ${ET_LINK_TARGET_DEBUG})
else()
@@ -254,11 +261,11 @@
cmake_parse_arguments(E "RPATH" "LINK_TARGET;LINK_TARGET_DEBUG;SUBDIR"
"SYMLINKS" ${ARGN})
- message("etype: ${etype}")
- message("etarg: ${etarg}")
- message("extproj: ${extproj}")
- message("extroot: ${extroot}")
- message("fname: ${fname}")
+ #message("etype: ${etype}")
+ #message("etarg: ${etarg}")
+ #message("extproj: ${extproj}")
+ #message("extroot: ${extroot}")
+ #message("fname: ${fname}")
# If we have a static target but BUILD_STATIC_LIBS is off, we're done
if ("${etype}" STREQUAL "STATIC" AND NOT BUILD_STATIC_LIBS)
@@ -332,7 +339,7 @@
get_filename_component(LDIR "${fname}" DIRECTORY)
ET_target_props(${etarg} "${SHARED_DIR}/${LDIR}" ${LINK_TARGET} SHARED
LINK_TARGET_DEBUG "${LINK_TARGET_DEBUG}")
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${SHARED_DIR}/${fname}"
DESTINATION ${SHARED_DIR}/${E_SUBDIR})
+ install(FILES "${CMAKE_BINARY_ROOT}/${SHARED_DIR}/${fname}" DESTINATION
${SHARED_DIR}/${E_SUBDIR})
# Let CMake know there is a target dependency here, despite this being an
import target
add_dependencies(${etarg} ${extproj})
@@ -348,7 +355,7 @@
# Add install rules for any symlinks the caller has listed
foreach(slink ${E_SYMLINKS})
fcfgcpy(TOUT ${extproj} ${extroot} ${slink} ${SHARED_DIR} ${slink})
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${SHARED_DIR}/${slink}"
DESTINATION ${SHARED_DIR}/${E_SUBDIR})
+ install(FILES "${CMAKE_BINARY_ROOT}/${SHARED_DIR}/${slink}" DESTINATION
${SHARED_DIR}/${E_SUBDIR})
endforeach(slink ${E_SYMLINKS})
endif (NOT MSVC)
@@ -363,7 +370,7 @@
fcfgcpy(TOUT ${extproj} ${extroot} ${fname} ${LIB_DIR} ${fname})
ET_target_props(${etarg} "${LIB_DIR}" ${fname} STATIC LINK_TARGET_DEBUG
"${LINK_TARGET_DEBUG}")
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${fname}"
DESTINATION ${LIB_DIR}/${E_SUBDIR})
+ install(FILES "${CMAKE_BINARY_ROOT}/${LIB_DIR}/${fname}" DESTINATION
${LIB_DIR}/${E_SUBDIR})
# Let CMake know there is a target dependency here, despite this being an
import target
add_dependencies(${etarg} ${extproj})
@@ -374,7 +381,7 @@
# Add install rules for any symlinks the caller has listed
foreach(slink ${E_SYMLINKS})
fcfgcpy(TOUT ${extproj} ${extroot} ${slink} ${LIB_DIR} ${slink})
- install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${slink}"
DESTINATION ${LIB_DIR})
+ install(FILES "${CMAKE_BINARY_ROOT}/${LIB_DIR}/${slink}" DESTINATION
${LIB_DIR})
endforeach(slink ${E_SYMLINKS})
endif (NOT MSVC)
@@ -390,7 +397,7 @@
ET_target_props(${etarg} "${BIN_DIR}" ${fname})
- install(PROGRAMS "${CMAKE_BINARY_DIR}/$<CONFIG>/${BIN_DIR}/${fname}"
DESTINATION ${BIN_DIR}/${E_SUBDIR})
+ install(PROGRAMS "${CMAKE_BINARY_ROOT}/${BIN_DIR}/${fname}" DESTINATION
${BIN_DIR}/${E_SUBDIR})
# Let CMake know there is a target dependency here, despite this being an
import target
add_dependencies(${etarg} ${extproj})
Modified: brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-18
14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/gdal.cmake 2020-10-18
15:19:10 UTC (rev 77482)
@@ -36,7 +36,7 @@
set(PNG_TARGET PNG_BLD)
endif (TARGET PNG_BLD)
- set(GDAL_INSTDIR ${CMAKE_BINARY_DIR}/gdal$<CONFIG>)
+ set(GDAL_INSTDIR ${CMAKE_BINARY_ROOT}/ext/gdal)
ExternalProject_Add(GDAL_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gdal"
@@ -43,11 +43,11 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${GDAL_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- -DZLIB_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
-
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
- -DPNG_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
-
-DPNG_LIBRARY=$<$<BOOL:${PNG_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
- -DPROJ4_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
+ -DZLIB_ROOT=${CMAKE_BINARY_ROOT}
+
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_ROOT}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
+ -DPNG_ROOT=${CMAKE_BINARY_ROOT}
+
-DPNG_LIBRARY=$<$<BOOL:${PNG_TARGET}>:${CMAKE_BINARY_ROOT}/${LIB_DIR}/${PNG_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
+ -DPROJ4_ROOT=${CMAKE_BINARY_ROOT}
-DGDAL_INST_DATA_DIR=${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/gdal
DEPENDS ${GDAL_DEPS}
)
@@ -169,10 +169,8 @@
set(GDAL_LIBRARY gdal CACHE STRING "Building bundled gdal" FORCE)
set(GDAL_LIBRARIES gdal CACHE STRING "Building bundled gdal" FORCE)
- # TODO - to make this work, need to add install logic to GDAL build to
position the headers in the right directories,
- # and more ByProducts functions to copy them to the build dir...
set(GDAL_INCLUDE_DIR
- "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/gdal"
+ "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/gdal"
"${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/port"
"${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/gcore"
"${BRLCAD_SOURCE_DIR}/src/superbuild/gdal/alg"
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-18
14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itcl.cmake 2020-10-18
15:19:10 UTC (rev 77482)
@@ -73,7 +73,7 @@
get_filename_component(TCLCONF_DIR "${TCL_LIBRARY}" DIRECTORY)
endif (TARGET tcl_stage)
- set(ITCL_INSTDIR ${CMAKE_BINARY_DIR}/itcl3$<CONFIG>)
+ set(ITCL_INSTDIR ${CMAKE_BINARY_ROOT}/ext/itcl3)
if (NOT MSVC)
@@ -86,7 +86,7 @@
URL "${CMAKE_CURRENT_SOURCE_DIR}/itcl3"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
PATCH_COMMAND rpath_replace "${CMAKE_BUILD_RPATH}" ${ITCL_PATCH_FILES}
- CONFIGURE_COMMAND
CPPFLAGS=-I${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR} ${ITCL_SRC_DIR}/configure
--prefix=${ITCL_INSTDIR} --exec-prefix=${ITCL_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TCLCONF_DIR}>
+ CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${ITCL_SRC_DIR}/configure
--prefix=${ITCL_INSTDIR} --exec-prefix=${ITCL_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TCLCONF_DIR}>
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-18
14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/itk.cmake 2020-10-18
15:19:10 UTC (rev 77482)
@@ -65,7 +65,7 @@
get_filename_component(TKCONF_DIR "${TK_LIBRARY}" DIRECTORY)
endif (TARGET tk_stage)
- set(ITK_INSTDIR ${CMAKE_BINARY_DIR}/itk3$<CONFIG>)
+ set(ITK_INSTDIR ${CMAKE_BINARY_ROOT}/ext/itk3)
if (NOT MSVC)
@@ -77,7 +77,7 @@
URL "${CMAKE_CURRENT_SOURCE_DIR}/itk3"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
PATCH_COMMAND rpath_replace "${CMAKE_BUILD_RPATH}" ${ITK_PATCH_FILES}
- CONFIGURE_COMMAND
CPPFLAGS=-I${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR} ${ITK_SRC_DIR}/configure
--prefix=${ITK_INSTDIR} --exec-prefix=${ITK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${ITCLCONF_DIR}>
+ CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${ITK_SRC_DIR}/configure
--prefix=${ITK_INSTDIR} --exec-prefix=${ITK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${ITCLCONF_DIR}>
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET} ${TK_TARGET} ${ITCL_TARGET}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-18 14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/iwidgets.cmake
2020-10-18 15:19:10 UTC (rev 77482)
@@ -57,7 +57,7 @@
# dependencies - just point it to our local source copy
set(ITK_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/itk3")
- set(IWIDGETS_INSTDIR "${CMAKE_BINARY_DIR}/iwidgets")
+ set(IWIDGETS_INSTDIR "${CMAKE_BINARY_ROOT}/ext/iwidgets")
if (NOT MSVC)
@@ -67,7 +67,7 @@
URL "${CMAKE_CURRENT_SOURCE_DIR}/iwidgets"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
PATCH_COMMAND rpath_replace "${CMAKE_BUILD_RPATH}"
${IWIDGETS_PATCH_FILES}
- CONFIGURE_COMMAND
CPPFLAGS=-I${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}
${IWIDGETS_SRC_DIR}/configure --prefix=${IWIDGETS_INSTDIR}
--exec-prefix=${IWIDGETS_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${ITCLCONF_DIR}>
--with-itk=${ITK_SOURCE_DIR}
+ CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${IWIDGETS_SRC_DIR}/configure
--prefix=${IWIDGETS_INSTDIR} --exec-prefix=${IWIDGETS_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TCLCONF_DIR}>
--with-tk=$<IF:$<BOOL:${TK_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TKCONF_DIR}>
--with-itcl=$<IF:$<BOOL:${ITCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${ITCLCONF_DIR}>
--with-itk=${ITK_SOURCE_DIR}
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET} ${TK_TARGET} ${ITCL_TARGET} ${ITK_TARGET}
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-18 14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-18 15:19:10 UTC (rev 77482)
@@ -19,7 +19,7 @@
set(NETPBM_BASENAME libnetpbm)
endif (MSVC)
- set(NETPBM_INSTDIR ${CMAKE_BINARY_DIR}/netpbm$<CONFIG>)
+ set(NETPBM_INSTDIR ${CMAKE_BINARY_ROOT}/ext/netpbm)
ExternalProject_Add(NETPBM_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/netpbm"
@@ -58,8 +58,8 @@
set(NETPBM_LIBRARY netpbm CACHE STRING "Building bundled netpbm" FORCE)
set(NETPBM_LIBRARIES netpbm CACHE STRING "Building bundled netpbm" FORCE)
- set(NETPBM_INCLUDE_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/netpbm"
CACHE STRING "Directory containing netpbm headers." FORCE)
- set(NETPBM_INCLUDE_DIRS
"${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/netpbm" CACHE STRING "Directory
containing netpbm headers." FORCE)
+ set(NETPBM_INCLUDE_DIR "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/netpbm" CACHE
STRING "Directory containing netpbm headers." FORCE)
+ set(NETPBM_INCLUDE_DIRS "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/netpbm" CACHE
STRING "Directory containing netpbm headers." FORCE)
SetTargetFolder(NETPBM_BLD "Third Party Libraries")
SetTargetFolder(netpbm "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
2020-10-18 14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/perplex.cmake
2020-10-18 15:19:10 UTC (rev 77482)
@@ -29,13 +29,8 @@
perplex_template.c
)
- 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_TEMPLATE "${CMAKE_BINARY_ROOT}/${DATA_DIR}/lemon/lempar.c" CACHE
PATH "lemon template" FORCE)
+ set(PERPLEX_TEMPLATE
"${CMAKE_BINARY_ROOT}/${DATA_DIR}/perplex/perplex_template.c" CACHE PATH
"perplex template" FORCE)
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)
Modified: brlcad/branches/thirdparty_rework/src/superbuild/png.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-18
14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/png.cmake 2020-10-18
15:19:10 UTC (rev 77482)
@@ -41,7 +41,7 @@
list(APPEND PNG_DEPS ZLIB_BLD zlib_stage)
endif (TARGET ZLIB_BLD)
- set(PNG_INSTDIR ${CMAKE_BINARY_DIR}/png$<CONFIG>)
+ set(PNG_INSTDIR ${CMAKE_BINARY_ROOT}/ext/png)
ExternalProject_Add(PNG_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/png"
@@ -50,8 +50,8 @@
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DSKIP_INSTALL_EXPORT=ON
-DPNG_STATIC=${BUILD_STATIC_LIBS} -DSKIP_INSTALL_EXECUTABLES=ON
-DSKIP_INSTALL_FILES=ON
-DSKIP_INSTALL_EXPORT=ON -DPNG_TESTS=OFF -Dld-version-script=OFF
-
-DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>>
-
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
+ -DZLIB_ROOT=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_ROOT}>
+
-DZLIB_LIBRARY=$<$<BOOL:${ZLIB_TARGET}>:${CMAKE_BINARY_ROOT}/${LIB_DIR}/${ZLIB_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}>
$<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX=ON>
$<$<BOOL:${ZLIB_TARGET}>:-DZ_PREFIX_STR=${Z_PREFIX_STR}>
-DPNG_LIB_NAME=${PNG_LIB_NAME} -DPNG_PREFIX=brl_
@@ -81,8 +81,8 @@
set(PNG_LIBRARY_DEBUG png CACHE STRING "Building bundled libpng" FORCE)
set(PNG_LIBRARY_RELEASE png CACHE STRING "Building bundled libpng" FORCE)
set(PNG_LIBRARIES png CACHE STRING "Building bundled libpng" FORCE)
- set(PNG_PNG_INCLUDE_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing libpng headers." FORCE)
- set(PNG_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing libpng headers." FORCE)
+ set(PNG_PNG_INCLUDE_DIR "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing libpng headers." FORCE)
+ set(PNG_INCLUDE_DIRS "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing libpng headers." FORCE)
SetTargetFolder(PNG_BLD "Third Party Libraries")
SetTargetFolder(png "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-18 14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/proj4.cmake
2020-10-18 15:19:10 UTC (rev 77482)
@@ -27,7 +27,7 @@
set(PROJ_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${PROJ_VERSION})
endif (MSVC)
- set(PROJ4_INSTDIR ${CMAKE_BINARY_DIR}/proj-4$<CONFIG>)
+ set(PROJ4_INSTDIR ${CMAKE_BINARY_ROOT}/ext/proj-4)
ExternalProject_Add(PROJ4_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/proj-4"
@@ -72,7 +72,7 @@
set(PROJ4_LIBRARIES proj CACHE STRING "Building bundled proj" FORCE)
- set(PROJ4_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/proj"
CACHE STRING "Directory containing proj headers." FORCE)
+ set(PROJ4_INCLUDE_DIRS "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/proj" CACHE
STRING "Directory containing proj headers." FORCE)
SetTargetFolder(PROJ4_BLD "Third Party Libraries")
SetTargetFolder(proj "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-18 14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/regex.cmake
2020-10-18 15:19:10 UTC (rev 77482)
@@ -22,7 +22,7 @@
set(REGEX_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${REGEX_VERSION})
endif (MSVC)
- set(REGEX_INSTDIR ${CMAKE_BINARY_DIR}/regex$<CONFIG>)
+ set(REGEX_INSTDIR ${CMAKE_BINARY_ROOT}/ext/regex)
# Platform differences in default linker behavior make it difficult to
# guarantee that our libregex symbols will override libc. We'll avoid the
@@ -52,7 +52,7 @@
)
set(REGEX_LIBRARIES regex CACHE STRING "Building bundled libregex" FORCE)
- set(REGEX_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing regex headers." FORCE)
+ set(REGEX_INCLUDE_DIRS "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing regex headers." FORCE)
SetTargetFolder(REGEX_BLD "Third Party Libraries")
SetTargetFolder(regex "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-18 14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/stepcode.cmake
2020-10-18 15:19:10 UTC (rev 77482)
@@ -31,7 +31,7 @@
list(APPEND SC_DEPS perplex_lemon perplex_re2c perplex_perplex)
endif (TARGET PERPLEX_BLD)
- set(STEPCODE_INSTDIR "${CMAKE_BINARY_DIR}/stepcode$<CONFIG>")
+ set(STEPCODE_INSTDIR "${CMAKE_BINARY_ROOT}/ext/stepcode")
ExternalProject_Add(STEPCODE_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/stepcode"
@@ -38,9 +38,9 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${STEPCODE_INSTDIR} -DLIB_DIR=${LIB_DIR}
-DBIN_DIR=${BIN_DIR}
-DCMAKE_INSTALL_RPATH=${CMAKE_BUILD_RPATH}
-DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
- -DLEMON_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
- -DRE2C_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
- -DPERPLEX_ROOT=${CMAKE_BINARY_DIR}/$<CONFIG>
+ -DLEMON_ROOT=${CMAKE_BINARY_ROOT}
+ -DRE2C_ROOT=${CMAKE_BINARY_ROOT}
+ -DPERPLEX_ROOT=${CMAKE_BINARY_ROOT}
-DSC_IS_SUBBUILD=ON -DSC_PYTHON_GENERATOR=OFF
-DSC_ENABLE_TESTING=OFF -DSC_ENABLE_COVERAGE=OFF
-DSC_BUILD_SCHEMAS=
-DINCLUDE_INSTALL_DIR=${INCLUDE_DIR}
@@ -50,7 +50,7 @@
# Tell the parent build about files and libraries
set(STEPCODE_LIBS base express exppp stepcore stepeditor stepdai steputils)
foreach(SCLIB ${STEPCODE_LIBS})
- ExternalProject_Target(SHARED lib${SCLIB} STEPCODE_BLD ${STEPCODE_INSTDIR}
+ ExternalProject_Target(SHARED ${SCLIB} STEPCODE_BLD ${STEPCODE_INSTDIR}
${SC_PREFIX}${SCLIB}${SC_SUFFIX}
SYMLINKS
${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX};${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}.2
LINK_TARGET ${SC_PREFIX}${SCLIB}${CMAKE_SHARED_LIBRARY_SUFFIX}
@@ -64,11 +64,11 @@
RPATH
)
foreach(SCLIB ${STEPCODE_LIBS})
- add_dependencies(${SCEXEC}_exe_stage lib${SCLIB}_stage)
+ add_dependencies(${SCEXEC}_exe_stage ${SCLIB}_stage)
endforeach(SCLIB ${STEPCODE_LIBS})
endforeach(SCEXEC ${STEPCODE_EXECS})
- ExternalProject_ByProducts(libstepcore STEPCODE_BLD ${STEPCODE_INSTDIR}
${INCLUDE_DIR}/stepcode
+ ExternalProject_ByProducts(stepcore STEPCODE_BLD ${STEPCODE_INSTDIR}
${INCLUDE_DIR}/stepcode
cldai/sdaiApplication_instance_set.h
cldai/sdaiSession_instance.h
cldai/sdaiObject.h
@@ -152,22 +152,22 @@
set(SYS_INCLUDE_PATTERNS ${SYS_INCLUDE_PATTERNS} stepcode CACHE STRING
"Bundled system include dirs" FORCE)
- set(STEPCODE_BASE_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/base CACHE STRING
"Building bundled STEPCODE" FORCE)
- set(STEPCODE_DAI_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/cldai CACHE STRING
"Building bundled STEPCODE" FORCE)
- set(STEPCODE_EDITOR_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/cleditor CACHE STRING
"Building bundled STEPCODE" FORCE)
- set(STEPCODE_STEPCORE_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/clstepcore CACHE STRING
"Building bundled STEPCODE" FORCE)
- set(STEPCODE_UTILS_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/clutils CACHE STRING
"Building bundled STEPCODE" FORCE)
- set(STEPCODE_EXPPP_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/exppp CACHE STRING
"Building bundled STEPCODE" FORCE)
- set(STEPCODE_EXPRESS_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode/express CACHE STRING
"Building bundled STEPCODE" FORCE)
- set(STEPCODE_INCLUDE_DIR
${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}/stepcode CACHE STRING "Building
bundled STEPCODE" FORCE)
+ set(STEPCODE_BASE_DIR ${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode/base
CACHE STRING "Building bundled STEPCODE" FORCE)
+ set(STEPCODE_DAI_DIR ${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode/cldai
CACHE STRING "Building bundled STEPCODE" FORCE)
+ set(STEPCODE_EDITOR_DIR
${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode/cleditor CACHE STRING "Building
bundled STEPCODE" FORCE)
+ set(STEPCODE_STEPCORE_DIR
${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode/clstepcore CACHE STRING "Building
bundled STEPCODE" FORCE)
+ set(STEPCODE_UTILS_DIR ${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode/clutils
CACHE STRING "Building bundled STEPCODE" FORCE)
+ set(STEPCODE_EXPPP_DIR ${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode/exppp
CACHE STRING "Building bundled STEPCODE" FORCE)
+ set(STEPCODE_EXPRESS_DIR
${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode/express CACHE STRING "Building
bundled STEPCODE" FORCE)
+ set(STEPCODE_INCLUDE_DIR ${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}/stepcode CACHE
STRING "Building bundled STEPCODE" FORCE)
- set(STEPCODE_BASE_LIBRARY libbase CACHE STRING "Building bundled STEPCODE"
FORCE)
- set(STEPCODE_EXPRESS_LIBRARY libexpress CACHE STRING "Building bundled
STEPCODE" FORCE)
- set(STEPCODE_EXPPP_LIBRARY libexppp CACHE STRING "Building bundled STEPCODE"
FORCE)
- set(STEPCODE_CORE_LIBRARY libstepcore CACHE STRING "Building bundled
STEPCODE" FORCE)
- set(STEPCODE_EDITOR_LIBRARY libstepeditor CACHE STRING "Building bundled
STEPCODE" FORCE)
- set(STEPCODE_DAI_LIBRARY libstepdai CACHE STRING "Building bundled STEPCODE"
FORCE)
- set(STEPCODE_UTILS_LIBRARY libsteputils CACHE STRING "Building bundled
STEPCODE" FORCE)
+ set(STEPCODE_BASE_LIBRARY base CACHE STRING "Building bundled STEPCODE"
FORCE)
+ set(STEPCODE_EXPRESS_LIBRARY express CACHE STRING "Building bundled
STEPCODE" FORCE)
+ set(STEPCODE_EXPPP_LIBRARY exppp CACHE STRING "Building bundled STEPCODE"
FORCE)
+ set(STEPCODE_CORE_LIBRARY stepcore CACHE STRING "Building bundled STEPCODE"
FORCE)
+ set(STEPCODE_EDITOR_LIBRARY stepeditor CACHE STRING "Building bundled
STEPCODE" FORCE)
+ set(STEPCODE_DAI_LIBRARY stepdai CACHE STRING "Building bundled STEPCODE"
FORCE)
+ set(STEPCODE_UTILS_LIBRARY steputils CACHE STRING "Building bundled
STEPCODE" FORCE)
set(EXP2CXX_EXECUTABLE exp2cxx_exe CACHE STRING "Building bundled STEPCODE"
FORCE)
set(EXPPP_EXECUTABLE exppp_exe CACHE STRING "Building bundled STEPCODE"
FORCE)
@@ -191,7 +191,7 @@
${STEPCODE_UTILS_LIBRARY}
CACHE STRING "Directories containing STEPCODE headers." FORCE)
- set(STEPCODE_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/stepcode CACHE STRING
"Building bundled STEPCODE" FORCE)
+ set(STEPCODE_DIR ${CMAKE_BINARY_ROOT}/ext/stepcode CACHE STRING "Building
bundled STEPCODE" FORCE)
SetTargetFolder(STEPCODE_BLD "Third Party Libraries")
SetTargetFolder(stepcode "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-18
14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tcl.cmake 2020-10-18
15:19:10 UTC (rev 77482)
@@ -38,7 +38,7 @@
add_executable(tcl_replace ${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx)
endif (NOT TARGET tcl_replace)
- set(TCL_INSTDIR ${CMAKE_BINARY_DIR}/tcl$<CONFIG>)
+ set(TCL_INSTDIR ${CMAKE_BINARY_ROOT}/ext/tcl)
if (NOT MSVC)
@@ -54,7 +54,7 @@
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
PATCH_COMMAND rpath_replace "${CMAKE_BUILD_RPATH}" ${TCL_PATCH_FILES}
COMMAND tcl_replace ${TCL_REWORK_FILES}
- CONFIGURE_COMMAND
CPPFLAGS=-I${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}
${TCL_SRC_DIR}/unix/configure --prefix=${TCL_INSTDIR}
+ CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${TCL_SRC_DIR}/unix/configure
--prefix=${TCL_INSTDIR}
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${ZLIB_TARGET} tcl_replace rpath_replace
@@ -343,8 +343,8 @@
set(TCL_LIBRARIES tcl CACHE STRING "Building bundled tcl" FORCE)
set(TCL_STUB_LIBRARY tclstub CACHE STRING "Building bundled tcl" FORCE)
set(TCL_TCLSH tclsh_exe CACHE STRING "Building bundled tcl" FORCE)
- set(TCL_INCLUDE_PATH "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
- set(TCL_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
+ set(TCL_INCLUDE_PATH "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
+ set(TCL_INCLUDE_DIRS "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
SetTargetFolder(TCL_BLD "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-18
14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/tk.cmake 2020-10-18
15:19:10 UTC (rev 77482)
@@ -34,7 +34,7 @@
add_executable(tcl_replace ${CMAKE_CURRENT_BINARY_DIR}/tcl_replace.cxx)
endif (NOT TARGET tcl_replace)
- set(TK_INSTDIR ${CMAKE_BINARY_DIR}/tk$<CONFIG>)
+ set(TK_INSTDIR ${CMAKE_BINARY_ROOT}/ext/tk)
if (NOT MSVC)
@@ -48,7 +48,7 @@
URL "${CMAKE_CURRENT_SOURCE_DIR}/tk"
BUILD_ALWAYS ${EXTERNAL_BUILD_UPDATE} ${LOG_OPTS}
PATCH_COMMAND rpath_replace "${CMAKE_BUILD_RPATH}" ${TK_PATCH_FILES}
- CONFIGURE_COMMAND
CPPFLAGS=-I${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR} ${TK_SRC_DIR}/unix/configure
--prefix=${TK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR},${TCLCONF_DIR}>
--disable-xft --enable-64bit --enable-rpath
+ CONFIGURE_COMMAND CPPFLAGS=-I${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}
LDFLAGS=-L${CMAKE_BINARY_ROOT}/${LIB_DIR} ${TK_SRC_DIR}/unix/configure
--prefix=${TK_INSTDIR}
--with-tcl=$<IF:$<BOOL:${TCL_TARGET}>,${CMAKE_BINARY_ROOT}/${LIB_DIR},${TCLCONF_DIR}>
--disable-xft --enable-64bit --enable-rpath
BUILD_COMMAND make -j${pcnt}
INSTALL_COMMAND make install
DEPENDS ${TCL_TARGET} rpath_replace
@@ -233,27 +233,9 @@
set(TK_STUB_LIBRARY tkstub CACHE STRING "Building bundled tk" FORCE)
#set(TTK_STUB_LIBRARY ttkstub CACHE STRING "Building bundled tk" FORCE)
set(TK_WISH wish_exe CACHE STRING "Building bundled tk" FORCE)
- set(TK_INCLUDE_PATH "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
- set(TK_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
+ set(TK_INCLUDE_PATH "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
+ set(TK_INCLUDE_DIRS "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
- #if (CMAKE_CONFIGURATION_TYPES)
- # set(TK_LIBRARY
"${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_LIBRARIES ${TK_LIBRARY} CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_STUB_LIBRARY
"${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${TK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TTK_STUB_LIBRARY
"${CMAKE_BINARY_DIR}/$<CONFIG>/${LIB_DIR}/${TTK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_WISH
"${CMAKE_BINARY_DIR}/$<CONFIG>/${BIN_DIR}/wish${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${EXE_EXT}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_INCLUDE_PATH "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
- # set(TK_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing tcl headers." FORCE)
- #else (CMAKE_CONFIGURATION_TYPES)
- # set(TK_LIBRARY
"${CMAKE_BINARY_DIR}/${LIB_DIR}/${TK_BASENAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_LIBRARIES ${TK_LIBRARY} CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_STUB_LIBRARY
"${CMAKE_BINARY_DIR}/${LIB_DIR}/${TK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TTK_STUB_LIBRARY
"${CMAKE_BINARY_DIR}/${LIB_DIR}/${TTK_STUBNAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_WISH
"${CMAKE_BINARY_DIR}/${BIN_DIR}/wish${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}${EXE_EXT}"
CACHE STRING "Building bundled tcl" FORCE)
- # set(TK_INCLUDE_PATH "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
- # set(TK_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/${INCLUDE_DIR}" CACHE STRING
"Directory containing tcl headers." FORCE)
- #endif (CMAKE_CONFIGURATION_TYPES)
-
SetTargetFolder(TK_BLD "Third Party Libraries")
SetTargetFolder(tk "Third Party Libraries")
Modified: brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-18
14:08:58 UTC (rev 77481)
+++ brlcad/branches/thirdparty_rework/src/superbuild/zlib.cmake 2020-10-18
15:19:10 UTC (rev 77482)
@@ -28,7 +28,7 @@
set(ZLIB_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}.${ZLIB_VERSION})
endif (MSVC)
- set(ZLIB_INSTDIR ${CMAKE_BINARY_DIR}/zlib$<CONFIG>)
+ set(ZLIB_INSTDIR ${CMAKE_BINARY_ROOT}/ext/zlib)
ExternalProject_Add(ZLIB_BLD
SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zlib"
@@ -57,8 +57,8 @@
set(ZLIB_LIBRARY_DEBUG zlib CACHE STRING "Building bundled zlib" FORCE)
set(ZLIB_LIBRARY_RELEASE zlib CACHE STRING "Building bundled zlib" FORCE)
set(ZLIB_LIBRARIES zlib CACHE STRING "Building bundled zlib" FORCE)
- set(ZLIB_INCLUDE_DIR "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing zlib headers." FORCE)
- set(ZLIB_INCLUDE_DIRS "${CMAKE_BINARY_DIR}/$<CONFIG>/${INCLUDE_DIR}" CACHE
STRING "Directory containing zlib headers." FORCE)
+ set(ZLIB_INCLUDE_DIR "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing zlib headers." FORCE)
+ set(ZLIB_INCLUDE_DIRS "${CMAKE_BINARY_ROOT}/${INCLUDE_DIR}" CACHE STRING
"Directory containing zlib headers." FORCE)
SetTargetFolder(ZLIB_BLD "Third Party Libraries")
SetTargetFolder(zlib "Third Party Libraries")
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
