From 18d335d2d0643b558b9bc25aa3f44dca6aa0015f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 16 May 2019 21:10:19 +0200 Subject: [PATCH] Windows compilation fight next round --- companion/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 0138940f8..2dc7e1d78 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -329,8 +329,9 @@ target_link_libraries(${SIMULATOR_NAME} PRIVATE ${CPN_COMMON_LIB}) ############# Install #################### # 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 "Au cas ou ... ${INSTALL_DESTINATION}") # the current flavour is not automatically added if build in the current cmake iteration, so always # add its library name to be sure @@ -446,7 +447,6 @@ endif() # WIN32 install # Create Windows installer with NSIS if(WIN32) - find_program(NSIS_EXE makensis.exe PATHS "C:/Program Files/NSIS" "C:/Program Files (x86)/NSIS"