Revision: 77392
http://sourceforge.net/p/brlcad/code/77392
Author: starseeker
Date: 2020-10-09 19:23:20 +0000 (Fri, 09 Oct 2020)
Log Message:
-----------
Couple adjustments
Modified Paths:
--------------
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
Modified:
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
===================================================================
---
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-09 19:14:02 UTC (rev 77391)
+++
brlcad/branches/thirdparty_rework/src/superbuild/CMake/ExternalProject_Target.cmake
2020-10-09 19:23:20 UTC (rev 77392)
@@ -325,9 +325,9 @@
fcfgcpy(TOUT ${extproj} ${extroot} ${LIB_DIR} ${E_SHARED} ${ENAME})
if (E_LINK_TARGET AND NOT MSVC)
ET_target_props(${etarg} "${E_IMPORT_PREFIX}" ${E_LINK_TARGET}
LINK_TARGET_DEBUG "${LINK_TARGET_DEBUG}")
- string(REPLACE "${LIB_DIR}/" "" ENAME ${E_LINK_TARGET})
else (E_LINK_TARGET AND NOT MSVC)
- ET_target_props(${etarg} "${E_IMPORT_PREFIX}" ${E_SHARED}
LINK_TARGET_DEBUG "${LINK_TARGET_DEBUG}")
+ string(REPLACE "${LIB_DIR}/" "" ENAME ${E_SHARED})
+ ET_target_props(${etarg} "${E_IMPORT_PREFIX}" ${ENAME} LINK_TARGET_DEBUG
"${LINK_TARGET_DEBUG}")
endif (E_LINK_TARGET AND NOT MSVC)
install(FILES "${CMAKE_BINARY_DIR}/$<CONFIG>/${E_SHARED}" DESTINATION
${LIB_DIR}/${E_SUBDIR})
Modified: brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
===================================================================
--- brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-09 19:14:02 UTC (rev 77391)
+++ brlcad/branches/thirdparty_rework/src/superbuild/netpbm.cmake
2020-10-09 19:23:20 UTC (rev 77392)
@@ -45,12 +45,13 @@
ppm.h
ppmcmap.h
ppmfloyd.h
+ pm_config.h
)
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_INSTALL_PREFIX}/$<CONFIG>/${INCLUDE_DIR}/netpbm" CACHE STRING
"Directory containing netpbm headers." FORCE)
- set(NETPBM_INCLUDE_DIRS
"${CMAKE_INSTALL_PREFIX}/$<CONFIG>/${INCLUDE_DIR}/netpbm" CACHE STRING
"Directory containing netpbm headers." 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)
SetTargetFolder(NETPBM_BLD "Third Party Libraries")
SetTargetFolder(netpbm "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
