diff --git a/isis/CMakeLists.txt b/isis/CMakeLists.txt index 63a86aa988b820b857ac5e9f1d12224ee4992839..04aa0d9cab3435643c25d5d8cc08bd015df82008 100644 --- a/isis/CMakeLists.txt +++ b/isis/CMakeLists.txt @@ -428,9 +428,9 @@ EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/TestPreferences ${CMAKE_BINARY install(CODE "EXECUTE_PROCESS(COMMAND cp -f ${CMAKE_SOURCE_DIR}/IsisPreferences ${CMAKE_INSTALL_PREFIX}/)") # Install the header files -install(CODE "EXECUTE_PROCESS(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/include/isis3)") +install(CODE "EXECUTE_PROCESS(COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/include/isis)") file(GLOB ISIS_INCLUDE_FILES ${CMAKE_BINARY_DIR}/inc/*) -install(CODE "EXECUTE_PROCESS(COMMAND cp -fv ${ISIS_INCLUDE_FILES} ${CMAKE_INSTALL_PREFIX}/include/isis3)") +install(DIRECTORY ${CMAKE_BINARY_DIR}/inc/ DESTINATION ${CMAKE_INSTALL_PREFIX}/include/isis) # Delete any existing plugin files in the build folder so they # don't get filled with duplicate entries. @@ -460,7 +460,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX}) install(DIRECTORY ${CMAKE_BINARY_DIR}/appdata DESTINATION ${CMAKE_INSTALL_PREFIX}) # Create the appdata directory with translations directory, images directory, templates directories -file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/appdata/translations +file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/appdata/translations ${CMAKE_BINARY_DIR}/appdata/templates/apollo ${CMAKE_BINARY_DIR}/appdata/templates/autoseed ${CMAKE_BINARY_DIR}/appdata/templates/autoreg @@ -512,10 +512,10 @@ add_dependencies(isis3 incs) # Add custom build target to copy modified translation files to the build/appdata/translations ## directory. add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_SOURCE_DIR}/appdata/serialnumbers/*.trn ${CMAKE_SOURCE_DIR}/appdata/translations/*.trn + ${CMAKE_SOURCE_DIR}/appdata/serialnumbers/*.trn ${CMAKE_SOURCE_DIR}/appdata/translations/*.trn ${CMAKE_SOURCE_DIR}/appdata/translations/*.typ ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.typ - ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft - ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.def ${CMAKE_SOURCE_DIR}/appdata/translations/*.def + ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.pft + ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.def ${CMAKE_SOURCE_DIR}/appdata/translations/*.def ${CMAKE_SOURCE_DIR}/appdata/translations/*.pvl ${CMAKE_BINARY_DIR}/appdata/translations) add_dependencies(isis3 appdata) @@ -573,7 +573,7 @@ add_custom_target(photometry ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different add_dependencies(isis3 photometry) add_custom_target(icons ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different - ${CMAKE_SOURCE_DIR}/appdata/images/icons/* ${CMAKE_SOURCE_DIR}/appdata/images/icons/licenses/* + ${CMAKE_SOURCE_DIR}/appdata/images/icons/* ${CMAKE_SOURCE_DIR}/appdata/images/icons/licenses/* ${CMAKE_BINARY_DIR}/appdata/images/icons) add_dependencies(isis3 icons) @@ -607,7 +607,7 @@ EXECUTE_PROCESS(COMMAND cp -rf ${CMAKE_SOURCE_DIR}/make ${CMAKE_BIN # Copy the files on make install as well install(FILES ${CMAKE_SOURCE_DIR}/IsisPreferences DESTINATION ${CMAKE_INSTALL_PREFIX}) -install(FILES ${CMAKE_SOURCE_DIR}/../LICENSE.md DESTINATION ${CMAKE_INSTALL_PREFIX}) +install(FILES ${CMAKE_SOURCE_DIR}/../LICENSE.md DESTINATION ${CMAKE_INSTALL_PREFIX}) install(FILES ${CMAKE_BINARY_DIR}/version DESTINATION ${CMAKE_INSTALL_PREFIX}) install(DIRECTORY ${CMAKE_SOURCE_DIR}/scripts DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 791099e3bfd3f651236431608dc7a93ef059b258..0aa9f9d76b1fcca0d4673dec911ae5fe4d9def4c 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -32,6 +32,7 @@ package: source: git_url: 'https://github.com/USGS-Astrogeology/ISIS3.git' git_tag: {{ version }} + # url: 'https://github.com/USGS-Astrogeology/ISIS3/archive/{{ version }}.tar.gz' # sha256 is the prefered checksum -- you can get it for a file with: # `openssl sha256 `. Simply run this command with the .tar.gz