Commit 619dbd57 authored by atl Upstream's avatar atl Upstream Committed by Atkins, Charles Vernon
Browse files

atl 2018-12-18 (b48bbeae) 

Code extracted from:

    https://github.com/GTkorvo/atl.git

at commit b48bbeaeba9e9176a8bbb324f06a26fabaae14f7 (master).

Upstream Shortlog
-----------------

Chuck Atkins (2):
      6f1b8eb0 Remove unused threads
      d1d518b0 Remove static with PIC build option
parent 4786d5d1

CMakeLists.txt

+2 −24
Original line number Diff line number Diff line
@@ -44,24 +44,6 @@ cmake_dependent_option(BUILD_SHARED_LIBS 
)

mark_as_advanced(BUILD_SHARED_LIBS)



# Setup PIC defaults.  If explicitly specified somehow, then default 

# to that.  Otherwise base the default on whether or not shared libs are even

# supported.

if(DEFINED ATL_ENABLE_PIC)

  set(ATL_ENABLE_PIC_DEFAULT ${ATL_ENABLE_PIC})

elseif(DEFINED CMAKE_POSITION_INDEPENDENT_CODE)

  set(ATL_ENABLE_PIC_DEFAULT ${CMAKE_POSITION_INDEPENDENT_CODE})

else()

  set(ATL_ENABLE_PIC_DEFAULT ${SHARED_LIBS_SUPPORTED})

endif()

cmake_dependent_option(ATL_ENABLE_PIC

  "Build with Position Independent Code" ${ATL_ENABLE_PIC_DEFAULT}

  "SHARED_LIBS_SUPPORTED" OFF

)

mark_as_advanced(ATL_ENABLE_PIC)

set(CMAKE_POSITION_INDEPENDENT_CODE ${ATL_ENABLE_PIC})

mark_as_advanced(CMAKE_POSITION_INDEPENDENT_CODE)



include(CheckTypeSize)

CHECK_TYPE_SIZE(double SIZEOF_DOUBLE)

CHECK_TYPE_SIZE(float SIZEOF_FLOAT)
@@ -106,11 +88,6 @@ target_include_directories(atl PUBLIC 
  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>

  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)



if(NOT ANDROID)

  find_package(Threads)

  target_link_libraries(atl PRIVATE ${CMAKE_THREADS_LIBS_INIT})

endif()



# Setup pkgconfig

configure_file(

  ${CMAKE_CURRENT_SOURCE_DIR}/atl.pc.in
@@ -203,6 +180,7 @@ if(NOT ATL_QUIET) 
  message( STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}" )

  message( STATUS "ATL_ATOM_SERVER_HOST = ${ATL_ATOM_SERVER_HOST}" )

  message( STATUS "ATL_LIBRARIES_ONLY = ${ATL_LIBRARIES_ONLY}" )

  message( STATUS "BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}" )

  message( STATUS "BUILD_TESTING = ${BUILD_TESTING}" )

  message( STATUS "Change a value with: cmake -D<Variable>=<Value>" )

  message( STATUS "----------------------------------------------------------------------------" )

atl.pc.in

+0 −1
Original line number Diff line number Diff line
@@ -8,4 +8,3 @@ URL: https://github.com/GTkorvo/atl.git 
Version: @ATL_VERSION@

Cflags: -I${includedir}

Libs: -L${libdir} -l@ATL_LIBRARY_PREFIX@atl
 
Libs.private: @CMAKE_THREADS_LIBS_INIT@