Compare commits

..

No commits in common. "7439747876e5d26d0c09b5a80deb1403f8811b58" and "d7b765fba5bb683eddeb54576d4800df64731fb9" have entirely different histories.

3 changed files with 8 additions and 9 deletions

View File

@ -1,5 +1,4 @@
cmake_minimum_required(VERSION 3.8) cmake_minimum_required(VERSION 3.8)
cmake_policy(SET CMP0068 NEW)
project(GermanAirlinesVA_GAConnector) project(GermanAirlinesVA_GAConnector)
@ -7,7 +6,6 @@ set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR TRUE)
set(PLUGIN_NAME GAConnector) set(PLUGIN_NAME GAConnector)
option(DEBUG "Debug symbols" OFF) option(DEBUG "Debug symbols" OFF)

View File

@ -55,12 +55,13 @@ endif()
if(APPLE) if(APPLE)
message("Building for MacOSX Universal into ${PROJECT_BINARY_DIR}/${PLUGIN_NAME}/${BIT}") message("Building for MacOSX Universal into ${PROJECT_BINARY_DIR}/${PLUGIN_NAME}/${BIT}")
set_target_properties(germanairlinesva_xplugin PROPERTIES set_target_properties(germanairlinesva_xplugin PROPERTIES
NO_SONAME 1
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME} LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}
OUTPUT_NAME mac OUTPUT_NAME mac
) )
target_compile_definitions(germanairlinesva_xplugin PUBLIC target_compile_definitions(germanairlinesva_xplugin PUBLIC
APL APL
) )
@ -78,13 +79,13 @@ if(APPLE)
) )
elseif(UNIX) elseif(UNIX)
message("Building for Linux ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}") message("Building for Linux ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
set_target_properties(germanairlinesva_xplugin PROPERTIES set_target_properties(germanairlinesva_xplugin PROPERTIES
NO_SONAME 1 NO_SONAME 1
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT} LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}
OUTPUT_NAME lin OUTPUT_NAME lin
) )
target_compile_definitions(germanairlinesva_xplugin PUBLIC target_compile_definitions(germanairlinesva_xplugin PUBLIC
LIN LIN
) )
@ -105,12 +106,12 @@ elseif(UNIX)
) )
elseif(WIN32) elseif(WIN32)
message("Building for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}") message("Building for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
set_target_properties(germanairlinesva_xplugin PROPERTIES set_target_properties(germanairlinesva_xplugin PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT} RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}
OUTPUT_NAME win OUTPUT_NAME win
) )
target_compile_definitions(germanairlinesva_xplugin PUBLIC target_compile_definitions(germanairlinesva_xplugin PUBLIC
IBM IBM
) )

View File

@ -277,4 +277,4 @@ void toLog(const std::string &message)
std::stringstream msg; std::stringstream msg;
msg << "German Airlines VA: " << message << std::endl; msg << "German Airlines VA: " << message << std::endl;
XPLMDebugString(msg.str().c_str()); XPLMDebugString(msg.str().c_str());
} }