Update ACE to 6.4.3

* Modify 3rd party build process. * Remove unused zlib sources * Add naked_ace.tgz to the repository * Use unique_ptr instead of deprecated auto_ptr
acidmanifesto · Feb 17, 2017 · a250444 · a250444
1 parent 1c02a76
commit a250444
Show file tree

Hide file tree

Showing 107 changed files with 105 additions and 31,605 deletions.
diff --git a/3rd_party/CMakeLists.txt b/3rd_party/CMakeLists.txt
@@ -1,45 +1,50 @@
 include(ExternalProject)
 function(encode_lib_name basename)
     if(UNIX)
-        set(${basename}_LIBRARY_STATIC lib${basename}.a PARENT_SCOPE)
         set(${basename}_LIBRARY_SHARED lib${basename}.so PARENT_SCOPE)
-        set(${basename}_LIBRARY_STATIC_D lib${basename}.a PARENT_SCOPE)
         set(${basename}_LIBRARY_SHARED_D lib${basename}.so PARENT_SCOPE)
+        set(${basename}_LIBRARY_STATIC lib${basename}.a PARENT_SCOPE)
+        set(${basename}_LIBRARY_STATIC_D lib${basename}.a PARENT_SCOPE)
+        set(${basename}_LIBRARY_IMP ${basename}.so PARENT_SCOPE)
+        set(${basename}_LIBRARY_IMP_D ${basename}.so PARENT_SCOPE)
     elseif(MSVC)
+        set(${basename}_LIBRARY_SHARED ${basename}.dll PARENT_SCOPE)
+        set(${basename}_LIBRARY_SHARED_D ${basename}d.dll PARENT_SCOPE)
         set(${basename}_LIBRARY_STATIC ${basename}.lib PARENT_SCOPE)
-        set(${basename}_LIBRARY_SHARED ${basename}.lib PARENT_SCOPE)
         set(${basename}_LIBRARY_STATIC_D ${basename}d.lib PARENT_SCOPE)
-        set(${basename}_LIBRARY_SHARED_D ${basename}d.dll PARENT_SCOPE)
+        set(${basename}_LIBRARY_IMP ${basename}.lib PARENT_SCOPE)
+        set(${basename}_LIBRARY_IMP_D ${basename}d.lib PARENT_SCOPE)
     elseif(MINGW)
         set(${basename}_LIBRARY_STATIC lib${basename}.a PARENT_SCOPE)
-        set(${basename}_LIBRARY_SHARED ${basename}.dll PARENT_SCOPE)
         set(${basename}_LIBRARY_STATIC_D lib${basename}.a PARENT_SCOPE)
-        set(${basename}_LIBRARY_SHARED_D ${basename}.dll PARENT_SCOPE)
+        set(${basename}_LIBRARY_SHARED lib${basename}.dll PARENT_SCOPE)
+        set(${basename}_LIBRARY_SHARED_D lib${basename}.dll PARENT_SCOPE)
+        set(${basename}_LIBRARY_IMP lib${basename}.dll PARENT_SCOPE)
+        set(${basename}_LIBRARY_IMP_D lib${basename}.dll PARENT_SCOPE)
     endif()
 endfunction()
 function(libname tgt basename)
     encode_lib_name(${basename})
     set(${tgt}_LIBRARY_STATIC ${ThirdParty_Install_Dir}/lib/${${basename}_LIBRARY_STATIC} PARENT_SCOPE)
-    set(${tgt}_LIBRARY_SHARED ${ThirdParty_Install_Dir}/lib/${${basename}_LIBRARY_SHARED} PARENT_SCOPE)
     set(${tgt}_LIBRARY_STATIC_D ${ThirdParty_Install_Dir}/lib/${${basename}_LIBRARY_STATIC_D} PARENT_SCOPE)
+    set(${tgt}_LIBRARY_SHARED ${ThirdParty_Install_Dir}/lib/${${basename}_LIBRARY_SHARED} PARENT_SCOPE)
     set(${tgt}_LIBRARY_SHARED_D ${ThirdParty_Install_Dir}/lib/${${basename}_LIBRARY_SHARED_D} PARENT_SCOPE)
+    set(${tgt}_LIBRARY_IMP ${ThirdParty_Install_Dir}/lib/${${basename}_LIBRARY_IMP} PARENT_SCOPE)
+    set(${tgt}_LIBRARY_IMP_D ${ThirdParty_Install_Dir}/lib/${${basename}_LIBRARY_IMP_D} PARENT_SCOPE)
 endfunction()
-
+macro(set_shared_lib_properties basename)
+    SET_PROPERTY(TARGET ${basename}_IMP APPEND PROPERTY IMPORTED_LOCATION ${ace_LIBRARY_SHARED} )
+    SET_PROPERTY(TARGET ${basename}_IMP APPEND PROPERTY IMPORTED_LOCATION_DEBUG ${${basename}_LIBRARY_SHARED_D} )
+    SET_PROPERTY(TARGET ${basename}_IMP APPEND PROPERTY IMPORTED_LOCATION_RELEASE ${${basename}_LIBRARY_SHARED} )
+    SET_PROPERTY(TARGET ${basename}_IMP APPEND PROPERTY IMPORTED_IMPLIB ${${basename}_LIBRARY_IMP} )
+    SET_PROPERTY(TARGET ${basename}_IMP APPEND PROPERTY IMPORTED_IMPLIB_RELEASE ${${basename}_LIBRARY_IMP} )
+    SET_PROPERTY(TARGET ${basename}_IMP APPEND PROPERTY IMPORTED_IMPLIB_DEBUG ${${basename}_LIBRARY_IMP_D} )
+endmacro()
 link_directories(${ThirdParty_Install_Dir}/lib)
 
 include(ExternalProject_CEREAL.cmake)
 include(ExternalProject_ACE.cmake)
-
-ExternalProject_add(
-   SQLite_BUILD
-   SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd_party/naked_sqlite
-   DOWNLOAD_COMMAND ""
-   UPDATE_COMMAND ""
-   INSTALL_DIR ${ThirdParty_Install_Dir}
-   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-)
-SET(SQLite_path ${ThirdParty_Install_Dir} PARENT_SCOPE)
-SET(SQLite_LIBRARIES sqlite PARENT_SCOPE)
+include(ExternalProject_SQLITE.cmake)
 
 ########################################################################################
 # Optional components

diff --git a/3rd_party/ExternalProject_ACE.cmake b/3rd_party/ExternalProject_ACE.cmake
@@ -1,18 +1,15 @@
 libname(ace ACE)
 ExternalProject_Add(
    ACE_BUILD
-   URL http://nemerle.eu/naked_ace.tar.gz
-   SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd_party/naked_ace
+   URL ${CMAKE_CURRENT_SOURCE_DIR}/naked_ace.tgz
    UPDATE_COMMAND ""
    INSTALL_DIR ${ThirdParty_Install_Dir}
-   CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_STAGING_PREFIX:PATH=${ThirdParty_Install_Dir}
+   CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_STAGING_PREFIX:PATH=${ThirdParty_Install_Dir} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
    CMAKE_GENERATOR "${CMAKE_GENERATOR}"
    CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
-   BUILD_BYPRODUCTS ${ace_LIBRARY_SHARED}
+   BUILD_BYPRODUCTS ${ace_LIBRARY_SHARED} ${ace_LIBRARY_STATIC} ${ace_LIBRARY_IMP}
 )
-
 ADD_LIBRARY(ace_IMP SHARED IMPORTED GLOBAL)
-add_dependencies(ace_IMP ace_BUILD)
-SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_LOCATION ${ace_LIBRARY_SHARED} )
-SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_LOCATION_DEBUG ${ace_LIBRARY_SHARED_D} )
-SET_PROPERTY(TARGET ace_IMP APPEND PROPERTY IMPORTED_LOCATION_RELEASE ${ace_LIBRARY_SHARED} )
+add_dependencies(ace_IMP ACE_BUILD)
+set_shared_lib_properties(ace)
+set_property(TARGET ace_IMP APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS ACE_HAS_DLL=1)
diff --git a/3rd_party/ExternalProject_CEREAL.cmake b/3rd_party/ExternalProject_CEREAL.cmake
@@ -5,6 +5,8 @@ ExternalProject_Add(
    UPDATE_COMMAND ""
    INSTALL_DIR ${ThirdParty_Install_Dir}
    CMAKE_ARGS -DJUST_INSTALL_CEREAL:BOOL=ON -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+   CMAKE_GENERATOR "${CMAKE_GENERATOR}"
+   CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
 )
 add_library(cereal_IMP INTERFACE IMPORTED GLOBAL)
 add_dependencies(cereal_IMP cereal_BUILD)

diff --git a/3rd_party/ExternalProject_SQLITE.cmake b/3rd_party/ExternalProject_SQLITE.cmake
@@ -0,0 +1,18 @@
+libname(sqlite sqlite)
+
+ExternalProject_Add(
+   SQLite_BUILD
+   SOURCE_DIR ${PROJECT_SOURCE_DIR}/3rd_party/naked_sqlite
+   DOWNLOAD_COMMAND ""
+   UPDATE_COMMAND ""
+   INSTALL_DIR ${ThirdParty_Install_Dir}
+   CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
+   CMAKE_GENERATOR "${CMAKE_GENERATOR}"
+   CMAKE_GENERATOR_TOOLSET ${CMAKE_GENERATOR_TOOLSET}
+   BUILD_BYPRODUCTS ${sqlite_LIBRARY_STATIC}
+)
+ADD_LIBRARY(sqlite_IMP STATIC IMPORTED GLOBAL)
+add_dependencies(sqlite_IMP ACE_BUILD)
+SET_PROPERTY(TARGET sqlite_IMP APPEND PROPERTY IMPORTED_LOCATION ${sqlite_LIBRARY_STATIC} )
+SET_PROPERTY(TARGET sqlite_IMP APPEND PROPERTY IMPORTED_LOCATION_DEBUG ${sqlite_LIBRARY_STATIC_D} )
+SET_PROPERTY(TARGET sqlite_IMP APPEND PROPERTY IMPORTED_LOCATION_RELEASE ${sqlite_LIBRARY_STATIC} )
diff --git a/3rd_party/naked_ace.tgz b/3rd_party/naked_ace.tgz
diff --git a/3rd_party/naked_sqlite/CMakeLists.txt b/3rd_party/naked_sqlite/CMakeLists.txt
@@ -12,5 +12,8 @@ ENDIF()
 IF(APPLE) # warning this is not foolproof
     SET(OS_NAME macosx)
 ENDIF()
+IF(MSVC)
+	set(CMAKE_DEBUG_POSTFIX "d")
+ENDIF()
 
 ADD_SUBDIRECTORY( sqlite )
diff --git a/3rd_party/zlib/CMakeLists.txt b/3rd_party/zlib/CMakeLists.txt