Skip to content

Commit

Permalink
Updated for compatibility with clion 182.3684.76.
Browse files Browse the repository at this point in the history
Signed-off-by: Eddie Ringle <[email protected]>
  • Loading branch information
vlebourl authored and EddieRingle committed Jul 26, 2018
1 parent b6eaaef commit 58076e3
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/main/kotlin/CMakeDocProvider.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import com.intellij.notification.NotificationType
import com.intellij.notification.Notifications
import com.intellij.psi.PsiElement
import com.jetbrains.cidr.cpp.toolchains.CPPToolchains
import com.jetbrains.cidr.cpp.cmake.psi.CMakeCommandName
import com.jetbrains.cidr.cpp.cmake.psi.CMakeElement
import com.jetbrains.cidr.cpp.cmake.psi.CMakeLiteral
import com.jetbrains.cidr.cpp.toolchains.CPPEnvironment
import com.jetbrains.cmake.psi.CMakeCommandName
import com.jetbrains.cmake.psi.CMakeElement
import com.jetbrains.cmake.psi.CMakeLiteral
import org.asciidoc.intellij.AsciiDoc
import org.jetbrains.rpc.LOG
import java.io.IOException
Expand All @@ -23,8 +24,9 @@ class CMakeDocProvider : AbstractDocumentationProvider() {
private val asciiDoc by lazy { AsciiDoc(createTempDir(), null, "clion-cmakedocs") }

fun runCMake(vararg args: String): Process {
val cmake = CPPToolchains.getInstance().getToolchainByNameOrDefault(null)!!.cMake!!
LOG.info("CDP - Executing CMake: ${cmake.executablePath} ${args.joinToString(" ")}")
val cppEnvironment = CPPEnvironment(CPPToolchains.getInstance().getToolchainByNameOrDefault(null)!!)
val cmake = cppEnvironment.cMake
LOG.info("CDP - Executing CMake: ${cmake!!.executablePath} ${args.joinToString(" ")}")
return ProcessBuilder(cmake.executablePath, *args).start()
}

Expand Down

0 comments on commit 58076e3

Please sign in to comment.