Skip to content

L
libzmq
Commit e88dc494 authored by Matt Arsenault's avatar Matt Arsenault Committed by Matt Arsenault
Browse files
Options

Fix random 3 space tabs

parent 59cafecd
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 61 deletions
CMakeLists.txt
View file @ e88dc494
...@@ -190,30 +190,30 @@ cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires Do ...@@ -190,30 +190,30 @@ cmake_dependent_option(WITH_DOC "Build Reference Guide documentation(requires Do
if(MSVC) if(MSVC)
if(WITH_OPENPGM) if(WITH_OPENPGM)
# set(OPENPGM_ROOT "" CACHE PATH "Location of OpenPGM") # set(OPENPGM_ROOT "" CACHE PATH "Location of OpenPGM")
set(OPENPGM_VERSION_MAJOR 5) set(OPENPGM_VERSION_MAJOR 5)
set(OPENPGM_VERSION_MINOR 2) set(OPENPGM_VERSION_MINOR 2)
set(OPENPGM_VERSION_MICRO 122) set(OPENPGM_VERSION_MICRO 122)
if(CMAKE_CL_64) if(CMAKE_CL_64)
find_path(OPENPGM_ROOT include/pgm/pgm.h find_path(OPENPGM_ROOT include/pgm/pgm.h
PATHS PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
message(STATUS "OpenPGM x64 detected - ${OPENPGM_ROOT}") message(STATUS "OpenPGM x64 detected - ${OPENPGM_ROOT}")
else() else()
find_path(OPENPGM_ROOT include/pgm/pgm.h find_path(OPENPGM_ROOT include/pgm/pgm.h
PATHS PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Miru\\OpenPGM ${OPENPGM_VERSION_MAJOR}.${OPENPGM_VERSION_MINOR}.${OPENPGM_VERSION_MICRO}]"
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
message(STATUS "OpenPGM x86 detected - ${OPENPGM_ROOT}") message(STATUS "OpenPGM x86 detected - ${OPENPGM_ROOT}")
endif(CMAKE_CL_64) endif(CMAKE_CL_64)
set(OPENPGM_INCLUDE_DIRS ${OPENPGM_ROOT}/include) set(OPENPGM_INCLUDE_DIRS ${OPENPGM_ROOT}/include)
set(OPENPGM_LIBRARY_DIRS ${OPENPGM_ROOT}/lib) set(OPENPGM_LIBRARY_DIRS ${OPENPGM_ROOT}/lib)
set(OPENPGM_LIBRARIES set(OPENPGM_LIBRARIES
optimized libpgm${_zmq_COMPILER}-mt-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib optimized libpgm${_zmq_COMPILER}-mt-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib
debug libpgm${_zmq_COMPILER}-mt-gd-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib) debug libpgm${_zmq_COMPILER}-mt-gd-${OPENPGM_VERSION_MAJOR}_${OPENPGM_VERSION_MINOR}_${OPENPGM_VERSION_MICRO}.lib)
endif() endif()
else() else()
if(WITH_OPENPGM) if(WITH_OPENPGM)
...@@ -386,16 +386,10 @@ set(readme-docs AUTHORS ...@@ -386,16 +386,10 @@ set(readme-docs AUTHORS
# optional modules # optional modules
if(WITH_OPENPGM) if(WITH_OPENPGM)
add_definitions( add_definitions(-DZMQ_HAVE_OPENPGM)
-DZMQ_HAVE_OPENPGM include_directories(${OPENPGM_INCLUDE_DIRS})
) link_directories(${OPENPGM_LIBRARY_DIRS})
include_directories( set(OPTIONAL_LIBRARIES ${OPENPGM_LIBRARIES})
${OPENPGM_INCLUDE_DIRS}
)
link_directories(
${OPENPGM_LIBRARY_DIRS}
)
set(OPTIONAL_LIBRARIES ${OPENPGM_LIBRARIES})
endif(WITH_OPENPGM) endif(WITH_OPENPGM)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
...@@ -434,13 +428,13 @@ if(MSVC) ...@@ -434,13 +428,13 @@ if(MSVC)
endif() endif()
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}
ARGS -E ARGS -E
copy copy
${nsis-template} ${nsis-template}
${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in ${CMAKE_CURRENT_BINARY_DIR}/NSIS.template.in
DEPENDS ${nsis-template}) DEPENDS ${nsis-template})
endif() endif()
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc) file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
...@@ -678,35 +672,35 @@ if(MSVC) ...@@ -678,35 +672,35 @@ if(MSVC)
include(CPack) include(CPack)
cpack_add_component_group(Development cpack_add_component_group(Development
DISPLAY_NAME "ZeroMQ software development kit" DISPLAY_NAME "ZeroMQ software development kit"
EXPANDED) EXPANDED)
cpack_add_component(PerfTools cpack_add_component(PerfTools
DISPLAY_NAME "ZeroMQ performance tools" DISPLAY_NAME "ZeroMQ performance tools"
INSTALL_TYPES FullInstall DevInstall) INSTALL_TYPES FullInstall DevInstall)
cpack_add_component(SourceCode cpack_add_component(SourceCode
DISPLAY_NAME "ZeroMQ source code" DISPLAY_NAME "ZeroMQ source code"
DISABLED DISABLED
INSTALL_TYPES FullInstall) INSTALL_TYPES FullInstall)
cpack_add_component(SDK cpack_add_component(SDK
DISPLAY_NAME "ZeroMQ headers and libraries" DISPLAY_NAME "ZeroMQ headers and libraries"
INSTALL_TYPES FullInstall DevInstall INSTALL_TYPES FullInstall DevInstall
GROUP Development) GROUP Development)
if(WITH_DOC) if(WITH_DOC)
cpack_add_component(RefGuide cpack_add_component(RefGuide
DISPLAY_NAME "ZeroMQ reference guide" DISPLAY_NAME "ZeroMQ reference guide"
INSTALL_TYPES FullInstall DevInstall INSTALL_TYPES FullInstall DevInstall
GROUP Development) GROUP Development)
endif() endif()
cpack_add_component(Runtime cpack_add_component(Runtime
DISPLAY_NAME "ZeroMQ runtime files" DISPLAY_NAME "ZeroMQ runtime files"
REQUIRED REQUIRED
INSTALL_TYPES FullInstall DevInstall MinInstall) INSTALL_TYPES FullInstall DevInstall MinInstall)
cpack_add_install_type(FullInstall cpack_add_install_type(FullInstall
DISPLAY_NAME "Full install, including source code") DISPLAY_NAME "Full install, including source code")
cpack_add_install_type(DevInstall cpack_add_install_type(DevInstall
DISPLAY_NAME "Developer install, headers and libraries") DISPLAY_NAME "Developer install, headers and libraries")
cpack_add_install_type(MinInstall cpack_add_install_type(MinInstall
DISPLAY_NAME "Minimal install, runtime only") DISPLAY_NAME "Minimal install, runtime only")
endif() endif()
# Export this for library to help build this as a sub-project # Export this for library to help build this as a sub-project
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment