Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
generators
EMAM2Cpp
Commits
46971d81
Commit
46971d81
authored
Oct 16, 2018
by
Christoph Richter
Browse files
fixup! AutopilotAdapter cmake install options for windows
parent
d172ec2b
Pipeline
#81519
failed with stages
in 13 minutes and 58 seconds
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
src/main/java/de/monticore/lang/monticar/generator/cpp/GeneratorCPP.java
View file @
46971d81
...
@@ -389,12 +389,6 @@ public class GeneratorCPP implements Generator {
...
@@ -389,12 +389,6 @@ public class GeneratorCPP implements Generator {
// add jni
// add jni
cmake
.
addCMakeCommand
(
"find_package(JNI)"
);
cmake
.
addCMakeCommand
(
"find_package(JNI)"
);
cmake
.
addCMakeCommand
(
"set(INCLUDE_DIRS ${INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})"
);
cmake
.
addCMakeCommand
(
"set(INCLUDE_DIRS ${INCLUDE_DIRS} ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})"
);
// set install dir
cmake
.
addCMakeCommand
(
"IF (WIN32)"
);
cmake
.
addCMakeCommand
(
"set(CMAKE_INSTALL_PREFIX $ENV{DLL_DIR})"
);
cmake
.
addCMakeCommand
(
"ELSE()"
);
cmake
.
addCMakeCommand
(
"set(CMAKE_INSTALL_PREFIX /usr/lib)"
);
cmake
.
addCMakeCommand
(
"ENDIF()"
);
// create shared lib
// create shared lib
cmake
.
addCMakeCommandEnd
(
"add_library(AutopilotAdapter SHARED AutopilotAdapter.cpp ${CMAKE_CURRENT_SOURCE_DIR})"
);
cmake
.
addCMakeCommandEnd
(
"add_library(AutopilotAdapter SHARED AutopilotAdapter.cpp ${CMAKE_CURRENT_SOURCE_DIR})"
);
cmake
.
addCMakeCommandEnd
(
"target_include_directories(AutopilotAdapter PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})"
);
cmake
.
addCMakeCommandEnd
(
"target_include_directories(AutopilotAdapter PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})"
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment