Skip to content

Commit

Permalink
Upgrade installer to support cmake linking statically or dynamically …
Browse files Browse the repository at this point in the history
…to Fast-DDS (#46)

* [11561] Add a FASTDDS_STATIC CMake variable to link statically to the binary deployment

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>

* [11561] Addressing reviewer's comments

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
  • Loading branch information
MiguelBarro authored May 18, 2021
1 parent cf611b5 commit 1ec8d22
Showing 1 changed file with 3 additions and 19 deletions.
22 changes: 3 additions & 19 deletions foonathan_memory-config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.

if(MSVC_VERSION EQUAL 1900)
if(CMAKE_CL_64)
include(
"${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-x64Win64VS2015/cmake/foonathan_memory-config.cmake")
else()
include(
"${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-i86Win32VS2015/cmake/foonathan_memory-config.cmake")
endif()
elseif(MSVC_VERSION LESS 1920)
if(CMAKE_CL_64)
include(
"${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-x64Win64VS2017/cmake/foonathan_memory-config.cmake")
else()
include(
"${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-i86Win32VS2017/cmake/foonathan_memory-config.cmake")
endif()
elseif(MSVC_VERSION GREATER_EQUAL 1920)
if(MSVC_VERSION LESS_EQUAL 1900)
message(FATAL_ERROR "Visual Studio version ${MSVC_VERSION} is no longer supported")
else()
if(CMAKE_CL_64)
include(
"${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-x64Win64VS2019/cmake/foonathan_memory-config.cmake")
else()
include(
"${CMAKE_CURRENT_LIST_DIR}/../share/foonathan_memory-i86Win32VS2019/cmake/foonathan_memory-config.cmake")
endif()
else()
message(FATAL_ERROR "Not supported version of Visual Studio")
endif()

0 comments on commit 1ec8d22

Please sign in to comment.