Windows compilation fight next round
This commit is contained in:
@@ -329,8 +329,9 @@ target_link_libraries(${SIMULATOR_NAME} PRIVATE ${CPN_COMMON_LIB})
|
|||||||
############# Install ####################
|
############# Install ####################
|
||||||
|
|
||||||
# Generate list of simulator plugins, used by all platforms
|
# Generate list of simulator plugins, used by all platforms
|
||||||
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/Release/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||||
message(STATUS "Search plugins GLOB = '${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}'")
|
message(STATUS "Search plugins GLOB = '${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}'")
|
||||||
|
message(STATUS "Au cas ou ... ${INSTALL_DESTINATION}")
|
||||||
|
|
||||||
# the current flavour is not automatically added if build in the current cmake iteration, so always
|
# the current flavour is not automatically added if build in the current cmake iteration, so always
|
||||||
# add its library name to be sure
|
# add its library name to be sure
|
||||||
@@ -446,7 +447,6 @@ endif() # WIN32 install
|
|||||||
|
|
||||||
# Create Windows installer with NSIS
|
# Create Windows installer with NSIS
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
|
|
||||||
find_program(NSIS_EXE makensis.exe PATHS
|
find_program(NSIS_EXE makensis.exe PATHS
|
||||||
"C:/Program Files/NSIS"
|
"C:/Program Files/NSIS"
|
||||||
"C:/Program Files (x86)/NSIS"
|
"C:/Program Files (x86)/NSIS"
|
||||||
|
|||||||
Reference in New Issue
Block a user