Commit 8069f093 authored by Jan Koester's avatar Jan Koester
Browse files

initial work pthread

parent 429ef469

libs/libsystempp/CMakeLists.txt

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ ELSE(CMAKE_BUILD_TYPE MATCHES DEBUG ) 
  endif( CMAKE_CXX_COMPILER_ID MATCHES GNU )

ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)



if( CMAKE_CXX_COMPILER_ID MATCHES MSVC)

  SET(CMAKE_CXX_FLAGS "-D_SCL_SECURE_NO_WARNINGS  /EHsc")	

endif( CMAKE_CXX_COMPILER_ID MATCHES MSVC)



set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}  ${CMAKE_SOURCE_DIR}/cmake/)



IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" )

libs/libsystempp/cmake/FindLinuxHeaders.cmake

0 → 100644
+30 −0
Original line number Diff line number Diff line 
# Find the kernel release

execute_process(

  COMMAND uname -r

  OUTPUT_VARIABLE LINUX_RELEASE

  OUTPUT_STRIP_TRAILING_WHITESPACE

)



# Find the headers

find_path(LINUXHEADERS_DIR

  include/linux/mutex.h

  PATHS /usr/src/linux-headers-${LINUX_RELEASE}

)



message(STATUS "Linux release: ${LINUX_RELEASE}")

message(STATUS "Linux headers: ${LINUXHEADERS_DIR}")



if (EXISTS ${LINUXHEADERS_DIR})

  set(LINUXHEADERS_INCLUDE_DIRS

    ${LINUXHEADERS_DIR}

    ${LINUXHEADERS_DIR}/include

    ${LINUXHEADERS_DIR}/arch/x86/include/

    ${LINUXHEADERS_DIR}/arch/x86/include/generated/

  )

  set(LINUXHEADERS_FOUND 1 )

else()

  set(LINUXHEADERS_FOUND 0)

endif()



mark_as_advanced(LINUXHEADERS_FOUND)

libs/libsystempp/src/CMakeLists.txt

+21 −12
Original line number Diff line number Diff line 
find_package(LinuxHeaders)



set(CMAKE_INCLUDE_CURRENT_DIR ON)

set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)



include(GenerateExportHeader)



set(systemppSrcs

    linux/start_linux.S

    linux/sysinfo_linux.cpp

    std/istream.cpp

    std/ostream.cpp

)

file(GLOB systemppSrcs "*.cpp" ".S")



file(GLOB libcSrcs "libc/*.cpp")



#os dependencies

IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

  list(APPEND systemppSrcs "linux/sysinfo_linux.cpp")

ENDIF()

if(${LINUXHEADERS_FOUND})

    message("Build with Linux Support")

    include_directories(

        ${LINUXHEADERS_INCLUDE_DIRS}

    )

    file(GLOB linuxSrcs "linux/*.cpp" "linux/*.S")

    list(APPEND systemppSrcs "linux/wrapper.c")

    list(APPEND systemppSrcs ${linuxSrcs})

endif()



include_directories(

  ${OPENSSL_INCLUDE_DIR}

)







add_library(systempp        SHARED ${systemppSrcs} )

add_library(systempp-static STATIC ${systemppSrcs} )



add_library(c SHARED ${libcSrcs})



generate_export_header(systempp)



target_link_libraries(systempp -e,"_start" -nostdlib)

target_link_libraries(systempp-static -nostdlib)    



target_link_libraries(c -nostdlib)



SET(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Output directory for libraries")



set_property(TARGET systempp PROPERTY VERSION ${Upstream_VERSION})
@@ -41,9 +52,7 @@ install(TARGETS systempp EXPORT systemppTargets 
  INCLUDES DESTINATION include

)



install(FILES feos/socket.h

              "${CMAKE_BINARY_DIR}/config.h"

              "${CMAKE_CURRENT_BINARY_DIR}/systempp_export.h"

install(DIRECTORY include/

        DESTINATION include/systempp

        COMPONENT Devel

)

libs/libsystempp/src/feos/dir.cpp

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line