git-svn-id: svn://db.shs.com.ru/pip@597 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5
This commit is contained in:
@@ -90,6 +90,11 @@ if (_PIP_VERSION_CHANGED)
|
||||
endif()
|
||||
|
||||
|
||||
# Compiler
|
||||
get_filename_component(C_COMPILER "${CMAKE_C_COMPILER}" NAME)
|
||||
#message("${C_COMPILER}")
|
||||
|
||||
|
||||
# Sources
|
||||
|
||||
# Main lib
|
||||
@@ -234,7 +239,10 @@ if ((NOT DEFINED LIBPROJECT) AND (DEFINED ANDROID_PLATFORM))
|
||||
#message("${ANDROID_NDK}/sysroot/usr/include")
|
||||
endif()
|
||||
if(WIN32)
|
||||
list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi)
|
||||
if(${C_COMPILER} STREQUAL "cl.exe")
|
||||
else()
|
||||
list(APPEND LIBS_MAIN ws2_32 iphlpapi psapi)
|
||||
endif()
|
||||
else()
|
||||
list(APPEND LIBS_MAIN dl)
|
||||
if(DEFINED ENV{QNX_HOST})
|
||||
@@ -256,10 +264,8 @@ if(WIN32)
|
||||
list(APPEND CPP_LIB_MAIN "pip_resource_win.rc")
|
||||
add_definitions(-DPSAPI_VERSION=1)
|
||||
add_library(pip SHARED ${CPP_LIB_MAIN} ${HDRS} ${PHDRS})
|
||||
if(${CMAKE_C_COMPILER} STREQUAL "cl")
|
||||
include(GenerateExportHeader)
|
||||
generate_export_header(pip)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Ot")
|
||||
if(${C_COMPILER} STREQUAL "cl.exe")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /Ob2 /Ot /W0")
|
||||
else()
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
|
||||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
|
||||
@@ -275,6 +281,10 @@ else()
|
||||
add_library(pip SHARED ${CPP_LIB_MAIN})
|
||||
endif()
|
||||
endif()
|
||||
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
|
||||
include(GenerateExportHeader)
|
||||
generate_export_header(pip)
|
||||
list(APPEND HDRS "${CMAKE_CURRENT_BINARY_DIR}/pip_export.h")
|
||||
target_link_libraries(pip ${LIBS_MAIN})
|
||||
|
||||
|
||||
@@ -393,7 +403,7 @@ endif()
|
||||
|
||||
# Test program
|
||||
add_executable(pip_test "main.cpp")
|
||||
target_link_libraries(pip_test pip pip_compress)
|
||||
target_link_libraries(pip_test pip)
|
||||
|
||||
|
||||
# Install
|
||||
@@ -412,6 +422,9 @@ if(LIB)
|
||||
file(COPY "${STDLIB}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/utils/code_model_generator")
|
||||
file(COPY "${STDLIB}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/utils/resources_compiler")
|
||||
endif()
|
||||
else()
|
||||
#message("${CMAKE_CURRENT_BINARY_DIR}/pip_export.h")
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pip_export.h DESTINATION include)
|
||||
endif()
|
||||
else()
|
||||
if(APPLE)
|
||||
@@ -430,6 +443,7 @@ if(LIB)
|
||||
install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)
|
||||
else()
|
||||
install(TARGETS ${PIP_LIBS_TARGETS} DESTINATION bin)
|
||||
install(FILES ${HDRS} DESTINATION include)
|
||||
message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user