Merge pull request #17 from awslabs/fix_mixed_builds

fixed mixed shared/static builds in the same build closure.

CMakeLists.txt

@@ -133,8 +133,14 @@ configure_file("cmake/${CMAKE_PROJECT_NAME}-config.cmake"
 
 install(FILES ${AWS_CAL_HEADERS} DESTINATION "include/aws/cal" COMPONENT Development)
 
+if (BUILD_SHARED_LIBS)
+   set (TARGET_DIR "shared")
+else()
+   set (TARGET_DIR "static")
+endif()
+
 install(EXPORT "${CMAKE_PROJECT_NAME}-targets"
-    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake"
+    DESTINATION "${LIBRARY_DIRECTORY}/${CMAKE_PROJECT_NAME}/cmake/${TARGET_DIR}/"
     NAMESPACE AWS::
     COMPONENT Development)
 

cmake/aws-c-cal-config.cmake

@@ -4,4 +4,9 @@ if (NOT BYO_CRYPTO AND NOT WIN32 AND NOT APPLE)
     find_dependency(LibCrypto)
 endif()
 
-include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])
+if (BUILD_SHARED_LIBS)
+    include(${CMAKE_CURRENT_LIST_DIR}/shared/@[email protected])
+else()
+    include(${CMAKE_CURRENT_LIST_DIR}/static/@[email protected])
+endif()
+

cmake/modules/FindLibCrypto.cmake

@@ -71,7 +71,9 @@ mark_as_advanced(
     LibCrypto_STATIC_LIBRARY
     )
 
-if(LIBCRYPTO_FOUND)
+if(LibCrypto_FOUND OR LIBCRYPTO_FOUND)
+    set(LibCrypto_FOUND true)
+    set(LIBCRYPTO_FOUND true)
     message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}")
     message(STATUS "LibCrypto Shared Lib:  ${LibCrypto_SHARED_LIBRARY}")
     message(STATUS "LibCrypto Static Lib:  ${LibCrypto_STATIC_LIBRARY}")