17.10.2013 - Adjusted for QNX, PIPeer release for Windows, Remote console
This commit is contained in:
@@ -2,7 +2,7 @@ project(pip)
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR} .)
|
||||
include(CheckFunctionExists)
|
||||
set(VERSION "0.0305")
|
||||
set(VERSION "0.0306")
|
||||
set(SOVERSION ${VERSION})
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
set(LIBS)
|
||||
@@ -51,12 +51,12 @@ endif ()
|
||||
|
||||
if (${WIN32})
|
||||
list(APPEND LIBS ws2_32 Iphlpapi)
|
||||
include(GenerateExportHeader)
|
||||
execute_process(COMMAND "make_rc_win.bat" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
list(APPEND CPPS "pip_resource_win.o")
|
||||
add_library(pip SHARED ${CPPS})
|
||||
generate_export_header(pip)
|
||||
if (${CMAKE_C_COMPILER} STREQUAL "cl")
|
||||
include(GenerateExportHeader)
|
||||
generate_export_header(pip)
|
||||
add_definitions("/O2 /Ob2 /Ot")
|
||||
else ()
|
||||
add_definitions("-O2")
|
||||
@@ -65,13 +65,12 @@ else ()
|
||||
add_definitions("-O2")
|
||||
if (DEFINED ENV{QNX_HOST})
|
||||
list(APPEND LIBS socket)
|
||||
add_definitions("-ftemplate-depth-32")
|
||||
add_library(pip STATIC ${CPPS})
|
||||
else ()
|
||||
list(APPEND LIBS pthread rt)
|
||||
include(GenerateExportHeader)
|
||||
add_definitions("-Wall -g3")
|
||||
add_library(pip SHARED ${CPPS})
|
||||
generate_export_header(pip)
|
||||
endif ()
|
||||
endif ()
|
||||
target_link_libraries(pip ${LIBS})
|
||||
|
||||
Reference in New Issue
Block a user