Skip to content
This repository was archived by the owner on Mar 25, 2019. It is now read-only.

Commit 29e8d98

Browse files
committed
CLion 2018.2 support and version advance
1 parent 27d9d1d commit 29e8d98

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

resources/META-INF/plugin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The plugin is free, but if you like it, you may support my work with a PayPal do
4848
</change-notes>
4949

5050
<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html for description -->
51-
<idea-version since-build="181.4203" until-build="182.*"/>
51+
<idea-version since-build="182.2371" until-build="182.*"/>
5252

5353
<!-- please see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/plugin_compatibility.html
5454
on how to target different products -->

src/xyz/elmot/clion/cubemx/ConvertProject.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,14 @@ public static void updateProject(Project project) {
8787
});
8888

8989
CMakeWorkspace cMakeWorkspace = CMakeWorkspace.getInstance(project);
90-
if (cMakeWorkspace.getCMakeFiles().isEmpty()) {
90+
if (cMakeWorkspace.getCMakeDependencyFiles().isEmpty()) {
9191
cMakeWorkspace.selectProjectDir(VfsUtil.virtualToIoFile(project.getBaseDir()));
9292
}
9393
cMakeWorkspace.scheduleClearGeneratedFilesAndReload();
9494
ApplicationManager.getApplication().executeOnPooledThread(() ->
9595
{
9696
try {
97-
cMakeWorkspace.waitForReloadsToFinish();
97+
cMakeWorkspace.waitForReloadsToFinish(100000);
9898
} catch (TimeoutException e) {
9999
throw new RootRuntimeException(e);
100100
}

0 commit comments

Comments
 (0)