From 7b490b03d942f781333c7c2ee61d70ae9e995c74 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 19 Jul 2015 18:15:41 +0200 Subject: [PATCH] Fix for windows installer build for 2.1 --- companion/src/CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index 7f0787a8c..687f795ef 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -10,9 +10,15 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -SET(COMPANION_NAME "companion${C9X_VERSION_SHORT}") -SET(SIMULATOR_NAME "simulator${C9X_VERSION_SHORT}") -SET( SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_VERSION_SHORT} ) +IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + SET(COMPANION_NAME "companion${C9X_VERSION_SHORT}") + SET(SIMULATOR_NAME "simulator${C9X_VERSION_SHORT}") + SET( SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_VERSION_SHORT} ) +ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + SET(COMPANION_NAME "companion") + SET(SIMULATOR_NAME "simulator") +ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + OPTION(DEBUG_IMPORT "Turns on debug output for EEPROM import") # Disabled by default