Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CMakeLists process translation files in the ISIS source code. #3726

Merged
merged 21 commits into from
Mar 4, 2020
Merged

Update CMakeLists process translation files in the ISIS source code. #3726

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
6dafcfa
Update meta.yaml to rename conda package to isis from isis3
krlberry Jan 10, 2020
5ea5b89
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Jan 10, 2020
4dd4d55
gMerge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Jan 14, 2020
03fdf3e
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Jan 24, 2020
ce7cf0a
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Feb 6, 2020
66deadf
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Feb 10, 2020
7d9374d
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Feb 12, 2020
5018b1f
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Feb 18, 2020
a73acba
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Feb 19, 2020
2a43a08
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Feb 21, 2020
834b5b5
Used CK quality for PCK selection in spiceinit (#3716)
jessemapel Feb 28, 2020
3b955cd
Adds the ability to save and restore a greyscale stretch to/from a Cu…
krlberry Feb 28, 2020
3eec82d
Updated kaguyatc2isis to allow ingestion of data provided by JAXA onl…
AustinSanders Feb 28, 2020
b59f3b2
Fixes ddd2isis to support updated uvflat files (#3719)
acpaquette Feb 28, 2020
e1e2903
Changed version numbers for 4.1 RC (#3722)
jessemapel Mar 3, 2020
1ce4258
Merge branch 'dev' of github.com:USGS-Astrogeology/ISIS3 into dev
krlberry Mar 3, 2020
08fcba2
Add directory structure for appdata in source
krlberry Mar 3, 2020
9a72acd
Update cmakelists to copy translation files over into the appdata/tra…
krlberry Mar 3, 2020
7abe157
Merge branch 'appdata' of github.com:USGS-Astrogeology/ISIS3 into app…
krlberry Mar 3, 2020
eb6eb79
Update to install appdata
krlberry Mar 3, 2020
35eb122
Add appdata/templates directory needed for apollo work.
krlberry Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion isis/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,9 +446,13 @@ endif()
file(WRITE "${CMAKE_BINARY_DIR}/qt.conf" "[Paths]\nPlugins=../3rdParty/plugins/\n")
install(FILES "${CMAKE_BINARY_DIR}/qt.conf" DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/xml)

#Create the inc directory
# Create the inc directory
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/inc)

# Create the appdata directory and translations directory
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/translations)
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/appdata/templates)

# Create an xml folder in the source directory that we will need later
set(sourceXmlFolder ${CMAKE_BINARY_DIR}/bin/xml)
execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/xml)
Expand All @@ -462,6 +466,9 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/templates DESTINATION .)
# Set up install of the make folder.
install(DIRECTORY ${CMAKE_SOURCE_DIR}/make DESTINATION ${CMAKE_INSTALL_PREFIX})

# Set up install of appdata folder
install(DIRECTORY ${CMAKE_BINARY_DIR}/appdata DESTINATION ${CMAKE_INSTALL_PREFIX})

# Have CMake process all of the source code and tests.
add_subdirectory(src objects)

Expand Down Expand Up @@ -490,6 +497,19 @@ add_custom_target(incs ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/src/*/apps/*/*.h ${CMAKE_BINARY_DIR}/inc)
add_dependencies(isis3 incs)

# Add custom build target to copy modified translation files to the build/appdata/translations
# directory. (As above - may need to be updated)
add_custom_target(appdata ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/serialnumbers/*.trn ${CMAKE_SOURCE_DIR}/src/*/apps/*/*.trn
${CMAKE_BINARY_DIR}/appdata/translations)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this copy the base translation files that will be in isis/appdata/translations to the build dir?

Copy link
Contributor Author

@krlberry krlberry Mar 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That isn't in this PR and is a very good point! I was planning to expand this to include the other directories (including everything that needs to be migrated from base) in a future PR, unless not having it in here is holding other work up?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh gotcha. I think it's fine to have it in a PR later with the rest of the base stuff, if everyone else thinks so.

add_dependencies(isis3 appdata)

# Add custom build target to copy modified template files to the build/appdata/templates
# directory. (As above - may need to be updated)
add_custom_target(templates ALL COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/appdata/templates/*.pvl ${CMAKE_BINARY_DIR}/appdata/templates)
add_dependencies(isis3 templates)

# Add a custom build target to clean out everything that gets added to the source
# directory during the build process.
# - Only a few things are added in order to make the tests work properly so
Expand Down