File install-destination.patch of Package dakota
--- CMakeLists.txt.org 2019-03-02 22:02:35.536291148 +0100
+++ CMakeLists.txt 2019-03-02 22:03:11.392804293 +0100
@@ -60,6 +60,10 @@
set(DAKOTA_TOPFILES_INSTALL "share/dakota" CACHE STRING
"Installation destination for DAKOTA top-level files")
+set(Dakota_INCLUDE_INSTALL_DIR include CACHE STRING
+ "Installation destination for DAKOTA headers")
+set(Dakota_LIB_INSTALL_DIR lib CACHE STRING
+ "Installation destination for DAKOTA libraries")
# Location for generated files
execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory
--- src/CMakeLists.txt.old 2019-03-03 00:09:11.008506832 +0100
+++ src/CMakeLists.txt 2019-03-03 00:11:47.338724671 +0100
@@ -901,8 +901,8 @@
#include(GetPrerequisites)
#list_prerequisites(${CMAKE_CURRENT_BINARY_DIR}/dakota)
-install(TARGETS dakota_src_fortran EXPORT ${ExportTarget} DESTINATION lib)
-install(TARGETS dakota_src EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS dakota_src_fortran EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
+install(TARGETS dakota_src EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(TARGETS dakota dakota_restart_util EXPORT DESTINATION bin)
install(TARGETS dakota_library_mode DESTINATION bin)
file(GLOB Dakota_hdr *.hpp *.h)
@@ -916,7 +916,7 @@
if (DAKOTA_DLL_API)
add_library(dakota_dll_api dakota_dll_api.cpp)
target_link_libraries(dakota_dll_api ${DAKOTA_ALL_LIBS})
- install(TARGETS dakota_dll_api DESTINATION lib)
+ install(TARGETS dakota_dll_api DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
DakotaApplyMPISettings(dakota_dll_api)
endif()
@@ -1038,9 +1038,6 @@
COMPATIBILITY AnyNewerVersion
)
-set(Dakota_INCLUDE_INSTALL_DIR include)
-set(Dakota_LIB_INSTALL_DIR lib)
-
configure_package_config_file(
${Dakota_SOURCE_DIR}/cmake/DakotaConfig.cmake.in
${Dakota_BINARY_DIR}/DakotaConfig.cmake
--- packages/pecos/CMakeLists.txt.old 2018-11-13 21:03:59.000000000 +0100
+++ packages/pecos/CMakeLists.txt 2019-03-02 23:28:04.281514316 +0100
@@ -225,7 +225,7 @@
add_library(pecos empty.cxx)
target_link_libraries(pecos ${SUBLIBS})
-install(TARGETS pecos EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS pecos EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
set(Pecos_LINK_LIBRARIES ${SUBLIBS} CACHE INTERNAL "Pecos link libraries")
--- packages/surfpack/src/CMakeLists.txt.old 2018-11-13 21:04:00.000000000 +0100
+++ packages/surfpack/src/CMakeLists.txt 2019-03-02 23:28:04.285514373 +0100
@@ -77,8 +77,8 @@
#endif()
#target_link_libraries(surfpack_src mars teuchos conmin ${LAPACK_LIBRARIES})
-install(TARGETS ${local_library} EXPORT ${ExportTarget} DESTINATION lib)
-install(TARGETS ${local_library}_fortran EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS ${local_library} EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
+install(TARGETS ${local_library}_fortran EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES SurfpackMatrix.h surfpack_system_headers.h DESTINATION include)
@@ -86,5 +86,5 @@
# Surfpack C interface, compiled into separate library for now, though
# no reason couldn't be directly in libsurfpack.
add_library(surfpack_c_interface surfpack_c_interface.cpp)
-install(TARGETS surfpack_c_interface DESTINATION lib)
+install(TARGETS surfpack_c_interface DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES surfpack_c_interface.h DESTINATION include)
\ No newline at end of file
--- packages/external/PSUADE/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/PSUADE/CMakeLists.txt 2019-03-02 23:28:04.285514373 +0100
@@ -20,7 +20,7 @@
add_library(psuade MOATAnalyzer.cpp MOATSampling.cpp DakotaPsuade.C)
install(TARGETS psuade
EXPORT ${ExportTarget}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
RUNTIME DESTINATION bin
)
--- packages/external/nidr/CMakeLists.txt.old 2018-11-13 21:03:56.000000000 +0100
+++ packages/external/nidr/CMakeLists.txt 2019-03-02 23:28:04.289514430 +0100
@@ -203,8 +203,8 @@
install(
TARGETS nidr
EXPORT ${ExportTarget}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
RUNTIME DESTINATION bin
)
@@ -212,12 +212,12 @@
configure_file(${NIDR_SOURCE_DIR}/cmake/nidr-config.cmake.in
${NIDR_BINARY_DIR}/cmake/nidr-config.cmake @ONLY)
install(FILES ${NIDR_BINARY_DIR}/cmake/nidr-config.cmake
- DESTINATION lib/cmake/nidr)
+ DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/nidr)
# Workaround until we fix Dakota's overall use of exports
if(ExportTarget STREQUAL NIDRTargets)
message(STATUS
"Installing NIDR exported targets to lib/cmake/NIDR")
- install(EXPORT ${ExportTarget} DESTINATION lib/cmake/NIDR)
+ install(EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/NIDR)
endif()
--- packages/external/FSUDace/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/FSUDace/CMakeLists.txt 2019-03-02 23:28:04.293514486 +0100
@@ -41,8 +41,8 @@
install(
TARGETS fsudace ${fsu_standalone}
EXPORT ${ExportTarget}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
RUNTIME DESTINATION bin
)
@@ -50,11 +50,11 @@
configure_file(${FSUDace_SOURCE_DIR}/cmake/FSUDaceConfig.cmake.in
${FSUDace_BINARY_DIR}/cmake/FSUDaceConfig.cmake @ONLY)
install(FILES ${FSUDace_BINARY_DIR}/cmake/FSUDaceConfig.cmake
- DESTINATION lib/cmake/FSUDace)
+ DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/FSUDace)
# Workaround until we fix Dakota's overall use of exports
if(ExportTarget STREQUAL FSUDaceTargets)
message(STATUS
"Installing FSUDace exported targets to lib/cmake/FSUDace")
- install(EXPORT ${ExportTarget} DESTINATION lib/cmake/FSUDace)
+ install(EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/FSUDace)
endif()
--- packages/external/dream/CMakeLists.txt.old 2018-11-13 21:03:56.000000000 +0100
+++ packages/external/dream/CMakeLists.txt 2019-03-02 23:28:04.293514486 +0100
@@ -13,7 +13,7 @@
add_subdirectory(test)
endif()
-install(TARGETS dream EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS dream EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
########### install files ###############
install(FILES
--- packages/external/queso/CMakeLists.txt.old 2018-11-13 21:03:56.000000000 +0100
+++ packages/external/queso/CMakeLists.txt 2019-03-02 23:28:04.297514543 +0100
@@ -183,4 +183,4 @@
# Apply MPI compiler/link options from Dakota MPI
DakotaApplyMPISettings(queso)
-install(TARGETS queso EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS queso EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/DDACE/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/DDACE/CMakeLists.txt 2019-03-02 23:28:04.301514599 +0100
@@ -30,8 +30,8 @@
macro(ddace_install_library lib)
install(TARGETS ${lib} EXPORT ${ExportTarget}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
RUNTIME DESTINATION bin
)
endmacro()
@@ -47,13 +47,13 @@
configure_file(${ddace_SOURCE_DIR}/cmake/ddace-config.cmake.in
${ddace_BINARY_DIR}/config/cmake/ddace-config.cmake @ONLY)
install(FILES ${ddace_BINARY_DIR}/config/cmake/ddace-config.cmake
- DESTINATION lib/cmake/ddace)
+ DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/ddace)
# Workaround until we fix Dakota's overall use of exports
if(ExportTarget STREQUAL ddaceTargets)
message(STATUS
"Installing ddace exported targets to lib/cmake/ddace")
- install(EXPORT ${ExportTarget} DESTINATION lib/cmake/ddace)
+ install(EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/ddace)
endif()
# TODO: move to directory-protected headers
--- packages/external/NL2SOL/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/NL2SOL/CMakeLists.txt 2019-03-02 23:28:04.305514657 +0100
@@ -17,5 +17,5 @@
set(ExportTarget ${CMAKE_PROJECT_NAME}-targets CACHE STRING
"Name for the export target for ${CMAKE_PROJECT_NAME}")
-install(TARGETS cport EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS cport EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES f2c.h DESTINATION include)
\ No newline at end of file
--- packages/external/NCSUOpt/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/NCSUOpt/CMakeLists.txt 2019-03-02 23:28:04.305514657 +0100
@@ -15,8 +15,8 @@
install(
TARGETS ncsuopt
EXPORT ${ExportTarget}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
RUNTIME DESTINATION bin
)
@@ -24,11 +24,11 @@
configure_file(${NCSUOpt_SOURCE_DIR}/cmake/NCSUOptConfig.cmake.in
${NCSUOpt_BINARY_DIR}/cmake/NCSUOptConfig.cmake @ONLY)
install(FILES ${NCSUOpt_BINARY_DIR}/cmake/NCSUOptConfig.cmake
- DESTINATION lib/cmake/NCSUOpt)
+ DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/NCSUOpt)
# Workaround until we fix Dakota's overall use of exports
if(ExportTarget STREQUAL NCSUOptTargets)
message(STATUS
"Installing NCSUOpt exported targets to lib/cmake/NCSUOpt")
- install(EXPORT ${ExportTarget} DESTINATION lib/cmake/NCSUOpt)
+ install(EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/NCSUOpt)
endif()
--- packages/external/dfftpack/CMakeLists.txt.old 2018-11-13 21:03:56.000000000 +0100
+++ packages/external/dfftpack/CMakeLists.txt 2019-03-02 23:28:04.309514713 +0100
@@ -92,4 +92,4 @@
## Set the dfftpack library name.
add_library(dfftpack ${dfftpack_SOURCES})
#set_target_properties(dfftpack PROPERTIES LINKER_LANGUAGE Fortran)
-install(TARGETS dfftpack EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS dfftpack EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/LHS/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/LHS/CMakeLists.txt 2019-03-02 23:28:04.313514770 +0100
@@ -66,12 +66,12 @@
macro(lhs_install_library lib)
install(TARGETS ${lib}
EXPORT ${ExportTarget}
- ARCHIVE DESTINATION lib
- LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
+ LIBRARY DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
RUNTIME DESTINATION bin
)
if(GNUtoMS)
- install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/lib${lib}.lib DESTINATION lib)
+ install(FILES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/lib${lib}.lib DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
endif()
endmacro()
@@ -194,7 +194,7 @@
install(FILES
${LHS_GNUtoMS_IMPORT}
${LHS_BINARY_DIR}/CMakeFiles/LHSConfig.cmake
- DESTINATION lib/cmake/LHS
+ DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/LHS
)
- install(EXPORT ${ExportTarget} DESTINATION lib/cmake/LHS)
+ install(EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}/cmake/LHS)
endif()
--- packages/external/ampl/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/ampl/CMakeLists.txt 2019-03-02 23:28:04.317514827 +0100
@@ -154,7 +154,7 @@
${CMAKE_CURRENT_BINARY_DIR}/AMPLConfig.cmake
)
-install(TARGETS amplsolver EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS amplsolver EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
#install(TARGETS genarith EXPORT ${ExportTarget} DESTINATION bin)
file(GLOB ampl_headers *.h *.hd)
--- packages/external/sciplot/CMakeLists.txt.old 2018-11-13 21:03:56.000000000 +0100
+++ packages/external/sciplot/CMakeLists.txt 2019-03-02 23:28:04.321514883 +0100
@@ -68,4 +68,4 @@
# TODO: Install package configuration and import files (.cmake files, targets).
-install(TARGETS dakota_sciplot EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS dakota_sciplot EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/pecos/src/CMakeLists.txt.old 2018-11-13 21:03:59.000000000 +0100
+++ packages/pecos/src/CMakeLists.txt 2019-03-02 23:28:04.325514940 +0100
@@ -65,5 +65,5 @@
if (HAVE_FFTW)
add_dependencies(pecos_src fftw)
endif()
-install(TARGETS pecos_src EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS pecos_src EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES ${Pecos_hdr} DESTINATION include)
--- packages/surfpack/src/interpreter/CMakeLists.txt.old 2018-11-13 21:04:00.000000000 +0100
+++ packages/surfpack/src/interpreter/CMakeLists.txt 2019-03-02 23:28:04.329514996 +0100
@@ -33,5 +33,5 @@
)
add_library(surfpack_interpreter ${surfpack_interpreter_sources})
-install(TARGETS surfpack_interpreter EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS surfpack_interpreter EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- src/api/java/CMakeLists.txt.old 2018-11-13 21:03:50.000000000 +0100
+++ src/api/java/CMakeLists.txt 2019-03-02 23:28:04.333515053 +0100
@@ -93,9 +93,9 @@
# Install class files to lib as well, but not the generated .java files
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gov DESTINATION lib
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gov DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR}
FILES_MATCHING PATTERN *.class)
-install(TARGETS dakotajni EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS dakotajni EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
# Be a little careful with removals in case build was in a source tree
# (don't remove .java files there)
--- packages/external/JEGA/MOGA/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/JEGA/MOGA/CMakeLists.txt 2019-03-02 23:28:04.333515053 +0100
@@ -11,4 +11,4 @@
src/PostProcessors/DistanceNichingPostProcessor.cpp
)
target_link_libraries(moga jega utilities)
-INSTALL(TARGETS moga EXPORT ${ExportTarget} DESTINATION lib)
+INSTALL(TARGETS moga EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/CONMIN/src/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/CONMIN/src/CMakeLists.txt 2019-03-02 23:28:04.341515166 +0100
@@ -6,7 +6,7 @@
## Set the CONMIN library name.
add_library(conmin ${conmin_SOURCES})
-INSTALL(TARGETS conmin EXPORT ${ExportTarget} DESTINATION lib)
+INSTALL(TARGETS conmin EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
# WJB - NOTE: 'sp_' prefix is used to distinguish this CONMIN lib
# from the one the built as part of DAKOTA. Work with Zack for an
--- packages/external/JEGA/SOGA/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/JEGA/SOGA/CMakeLists.txt 2019-03-02 23:28:04.341515166 +0100
@@ -8,4 +8,4 @@
src/SOGA.cpp
)
target_link_libraries(soga jega utilities)
-INSTALL(TARGETS soga EXPORT ${ExportTarget} DESTINATION lib)
+INSTALL(TARGETS soga EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/JEGA/Utilities/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/JEGA/Utilities/CMakeLists.txt 2019-03-02 23:28:04.345515224 +0100
@@ -42,4 +42,4 @@
src/TwoSidedInequalityConstraintType.cpp
src/UnconstrainedStatistician.cpp
)
-install(TARGETS utilities EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS utilities EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/JEGA/src/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/JEGA/src/CMakeLists.txt 2019-03-02 23:28:04.349515280 +0100
@@ -73,4 +73,4 @@
#endif()
#target_link_libraries(jega ${jega_link_libs})
-INSTALL(TARGETS jega EXPORT ${ExportTarget} DESTINATION lib)
+INSTALL(TARGETS jega EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/pecos/util/src/CMakeLists.txt.old 2018-11-13 21:03:59.000000000 +0100
+++ packages/pecos/util/src/CMakeLists.txt 2019-03-02 23:28:04.353515337 +0100
@@ -43,5 +43,5 @@
add_library(pecos_util ${UTIL_SOURCES} ${UTIL_HEADERS})
#SET(CMAKE_INCLUDE_CURRENT_DIR ON)
#target_link_libraries(pecos_util ${Teuchos_LIBRARIES})
-install(TARGETS pecos_util EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS pecos_util EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES ${UTIL_HEADERS} DESTINATION include)
--- packages/external/OPTPP/src/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/OPTPP/src/CMakeLists.txt 2019-03-02 23:28:04.357515393 +0100
@@ -35,4 +35,4 @@
LIBRARY_OUTPUT_DIRECTORY ${optpp_BINARY_DIR}/lib
ARCHIVE_OUTPUT_DIRECTORY ${optpp_BINARY_DIR}/lib)
-install(TARGETS ${local_library} EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS ${local_library} EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/VPISparseGrid/src/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/VPISparseGrid/src/CMakeLists.txt 2019-03-02 23:28:04.357515393 +0100
@@ -8,7 +8,7 @@
add_library(sparsegrid ${sparsegrid_LIB_SRCS})
# Compile for position-independent code for use in the higher-level Pecos shared lib
-install(TARGETS sparsegrid EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS sparsegrid EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
########### install files ###############
install(FILES sandia_cubature.hpp sandia_rules.hpp sandia_sgmg.hpp sandia_sgmgg.hpp sandia_sgmga.hpp DESTINATION include)
--- packages/external/NOMAD/src/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/NOMAD/src/CMakeLists.txt 2019-03-02 23:28:04.361515450 +0100
@@ -55,4 +55,4 @@
## Set the NOMAD library name.
add_library(nomad ${nomad_SOURCES})
-install(TARGETS nomad EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS nomad EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/approxnn/src/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/approxnn/src/CMakeLists.txt 2019-03-02 23:28:04.365515507 +0100
@@ -31,5 +31,5 @@
#set_target_properties(approxnn PROPERTIES DEFINE_SYMBOL DLL_EXPORTS)
#set_target_properties(approxnn PROPERTIES COMPILE_DEFINITIONS ...)
-install(TARGETS approxnn EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS approxnn EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES ${ApproxNN_HEADERS} DESTINATION include)
--- packages/external/hopspack/src/CMakeLists.txt.old 2018-11-13 21:03:56.000000000 +0100
+++ packages/external/hopspack/src/CMakeLists.txt 2019-03-02 23:28:04.365515507 +0100
@@ -86,7 +86,7 @@
#---- Installation instructions.
IF (INSTALL_LIB)
- INSTALL (TARGETS ${local_library} EXPORT ${ExportTarget} DESTINATION lib)
+ INSTALL (TARGETS ${local_library} EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
ENDIF (INSTALL_LIB)
IF (INSTALL_HEADERS)
FILE (GLOB_RECURSE hopspack_headers *.hpp *.h)
--- packages/external/JEGA/FrontEnd/Core/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/JEGA/FrontEnd/Core/CMakeLists.txt 2019-03-02 23:28:04.365515507 +0100
@@ -6,4 +6,4 @@
src/SimpleFunctorEvaluatorCreator.cpp
)
target_link_libraries(jega_fe moga soga eutils)
-INSTALL(TARGETS jega_fe EXPORT ${ExportTarget} DESTINATION lib)
+INSTALL(TARGETS jega_fe EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/JEGA/eddy/utilities/CMakeLists.txt.old 2018-11-13 21:03:54.000000000 +0100
+++ packages/external/JEGA/eddy/utilities/CMakeLists.txt 2019-03-02 23:28:04.369515563 +0100
@@ -3,4 +3,4 @@
src/Math.cpp
src/RandomNumberGenerator.cpp
)
-INSTALL(TARGETS eutils EXPORT ${ExportTarget} DESTINATION lib)
+INSTALL(TARGETS eutils EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/acro/tpl/tinyxml/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/tpl/tinyxml/CMakeLists.txt 2019-03-02 23:28:04.369515563 +0100
@@ -15,5 +15,5 @@
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include> )
endif()
-install(TARGETS tinyxml EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS tinyxml EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES tinyxml/tinyxml.h tinyxml/tinystr.h DESTINATION include)
--- packages/external/acro/tpl/3po/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/tpl/3po/CMakeLists.txt 2019-03-02 23:28:04.373515620 +0100
@@ -2,5 +2,5 @@
cobyla2c/cobyla.c
hooke/hooke_tpl.cpp
)
-install(TARGETS 3po EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS 3po EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(FILES cobyla2c/cobyla.h DESTINATION include/3po)
--- packages/external/acro/tpl/ampl/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/tpl/ampl/CMakeLists.txt 2019-03-02 23:28:04.373515620 +0100
@@ -154,7 +154,7 @@
${CMAKE_CURRENT_BINARY_DIR}/AMPLConfig.cmake
)
-install(TARGETS amplsolver EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS amplsolver EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
#install(TARGETS genarith EXPORT ${ExportTarget} DESTINATION bin)
file(GLOB ampl_headers *.h *.hd)
--- packages/external/acro/packages/interfaces/src/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/packages/interfaces/src/CMakeLists.txt 2019-03-02 23:28:04.373515620 +0100
@@ -38,7 +38,7 @@
target_link_libraries(interfaces optpp teuchos)
endif()
-install(TARGETS interfaces EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS interfaces EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
if(HAVE_BOOST)
if(HAVE_AMPL)
--- packages/external/acro/packages/pebbl/src/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/packages/pebbl/src/CMakeLists.txt 2019-03-02 23:28:04.377515677 +0100
@@ -106,7 +106,7 @@
utilib
)
-install(TARGETS pebbl EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS pebbl EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
# These are really testers, so are built, but not installed
#install(TARGETS knapMPS EXPORT ${ExportTarget} DESTINATION bin)
#install(TARGETS lipshitzian EXPORT ${ExportTarget} DESTINATION bin)
--- packages/external/acro/packages/colin/src/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/packages/colin/src/CMakeLists.txt 2019-03-02 23:28:04.377515677 +0100
@@ -77,7 +77,7 @@
target_link_libraries(colin amplsolver)
endif()
-install(TARGETS colin EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS colin EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
install(DIRECTORY colin DESTINATION include PATTERN ".svn" EXCLUDE
PATTERN "Makefile.am" EXCLUDE)
--- packages/external/acro/packages/scolib/src/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/packages/scolib/src/CMakeLists.txt 2019-03-02 23:28:04.381515733 +0100
@@ -60,7 +60,7 @@
scolib
)
-install(TARGETS scolib EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS scolib EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
# These testers will be built, but not installed:
#install(TARGETS scolib_driver EXPORT ${ExportTarget} DESTINATION bin)
#install(TARGETS scolib_docking EXPORT ${ExportTarget} DESTINATION bin)
--- packages/external/acro/packages/utilib/src/libs/CMakeLists.txt.old 2018-11-13 21:03:55.000000000 +0100
+++ packages/external/acro/packages/utilib/src/libs/CMakeLists.txt 2019-03-02 23:28:04.381515733 +0100
@@ -96,4 +96,4 @@
message("linking utilib against ${libs}")
target_link_libraries(utilib ${libs})
-install(TARGETS utilib EXPORT ${ExportTarget} DESTINATION lib)
+install(TARGETS utilib EXPORT ${ExportTarget} DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
--- packages/external/trilinos/cmake/tribits/examples/RawHelloWorld/hello_world/CMakeLists.txt.old 2018-11-13 21:03:56.000000000 +0100
+++ packages/external/trilinos/cmake/tribits/examples/RawHelloWorld/hello_world/CMakeLists.txt 2019-03-02 23:28:04.381515733 +0100
@@ -2,7 +2,7 @@
SET(HEADERS hello_world_lib.hpp)
SET(SOURCES hello_world_lib.cpp)
ADD_LIBRARY(hello_world_lib ${SOURCES})
-INSTALL(TARGETS hello_world_lib DESTINATION lib)
+INSTALL(TARGETS hello_world_lib DESTINATION ${${CMAKE_PROJECT_NAME}_LIB_INSTALL_DIR})
INSTALL(FILES ${HEADERS} DESTINATION include)
# Build and install user executable