Commit 412b4922 authored by pieper's avatar pieper
Browse files

BUG: set correct library for libarchive and ENH: add Slicer4 launcher as a...

BUG: set correct library for libarchive and ENH: add Slicer4 launcher as a copy of the Slicer3 launcher (use of Slicer3 is deprecated, but will require careful search of the source code to replace, since the string is used many places)

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15629 3bd1e089-480b-0410-8dfb-8563597acbee
parent 3e4477a4
......@@ -39,6 +39,8 @@ set(launcher_source
"${CMAKE_CURRENT_SOURCE_DIR}/Slicer3Launchers/${launcher_name}")
SET(launcher_binary
"${Slicer_BINARY_DIR}/Slicer4${CMAKE_EXECUTABLE_SUFFIX}")
SET(launcher_compatibility_binary
"${Slicer_BINARY_DIR}/Slicer3${CMAKE_EXECUTABLE_SUFFIX}")
# MESSAGE(STATUS "launcher_platform: ${launcher_platform}")
......@@ -48,7 +50,9 @@ SET(launcher_binary
if(EXISTS "${launcher_source}")
configure_file("${launcher_source}" "${launcher_binary}" COPYONLY)
configure_file("${launcher_source}" "${launcher_compatibility_binary}" COPYONLY)
install(PROGRAMS "${launcher_binary}" DESTINATION ".")
install(PROGRAMS "${launcher_compatibility_binary}" DESTINATION ".")
endif(EXISTS "${launcher_source}")
# Should this location change, change Application/GUI/Slicer3.cxx as well
......
......@@ -465,7 +465,11 @@ proc launch_SetEnvironment {} {
set ::env(bmModuleDescriptionParser_DIR) $::env(BatchMake_BIN_DIR)
set ::env(LibArchive_DIR) [file normalize "@LibArchive_DIR@"]
set ::env(LibArchive_LIB_DIR) [file normalize "@LibArchive_DIR@/bin/$::LibArchive_BUILD_SUBDIR"]
if {$::env(BUILD) == $::WINDOWS} {
set ::env(LibArchive_LIB_DIR) [file normalize "@LibArchive_DIR@/bin/$::LibArchive_BUILD_SUBDIR"]
} else {
set ::env(LibArchive_LIB_DIR) [file normalize "@LibArchive_DIR@/"]
}
# Slicer3 Libs
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment