File tree 2 files changed +4
-4
lines changed
2 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -94,8 +94,8 @@ target_include_directories(jssc PRIVATE ${JNI_INCLUDE_DIRS} ${JSSC_ADDITIONAL_IN
94
94
set_target_properties (jssc PROPERTIES VERSION ${PROJECT_VERSION} )
95
95
set_target_properties (jssc PROPERTIES PUBLIC_HEADER target /nar/javah-include /jssc_SerialNativeInterface.h)
96
96
set_target_properties (jssc PROPERTIES POSITION_INDEPENDENT_CODE ON )
97
- if (MSVC )
98
- # Fix paths for Debug/Release
97
+ if (WIN32 )
98
+ # Fix paths for MSVC ( Debug/Release) and MINGW
99
99
set_target_properties (jssc PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_LIBRARY_OUTPUT_DIRECTORY} " )
100
100
set_target_properties (jssc PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY} " )
101
101
endif ()
Original file line number Diff line number Diff line change 203
203
</profile >
204
204
205
205
<!-- mingw32 profile -->
206
- <!-- TODO: Untested. Test this mingw32 profile: "mvn -P cmake-mingw32 install" -->
207
206
<profile >
208
207
<id >cmake-mingw32</id >
209
208
<properties >
212
211
<cmake .classifier>windows-x86_32</cmake .classifier>
213
212
<cmake .option.first>-DCMAKE_TOOLCHAIN_FILE=toolchain/Mingw32.cmake</cmake .option.first>
214
213
<cmake .option.second>-DNATIVE_LIB_DIR=${native.lib.directory} </cmake .option.second>
214
+ <cmake .child.dir>bin/cmake</cmake .child.dir>
215
215
</properties >
216
216
</profile >
217
217
218
218
<!-- mingw64 profile -->
219
- <!-- TODO: Untested. Test this mingw64 profile: "mvn -P cmake-mingw64 install" -->
220
219
<profile >
221
220
<id >cmake-mingw64</id >
222
221
<properties >
225
224
<cmake .classifier>windows-x86_64</cmake .classifier>
226
225
<cmake .option.first>-DCMAKE_TOOLCHAIN_FILE=toolchain/Mingw64.cmake</cmake .option.first>
227
226
<cmake .option.second>-DNATIVE_LIB_DIR=${native.lib.directory} </cmake .option.second>
227
+ <cmake .child.dir>bin/cmake</cmake .child.dir>
228
228
</properties >
229
229
</profile >
230
230
You can’t perform that action at this time.
0 commit comments