From 0859133d472214453d6fbd4500a7f400812a4add Mon Sep 17 00:00:00 2001 From: Torndeco Date: Fri, 5 Jun 2015 03:04:08 +0100 Subject: [PATCH] CMake Fix for non MSVC Installs The return function is causing Data/CMakeLists.txt to exit early before they include sub directories. i.e Data/MySQL Data/ODBC Data/SQLite http://www.cmake.org/cmake/help/v3.0/command/return.html --- cmake/PocoMacros.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake index f5b1ac331..2cbef69d6 100644 --- a/cmake/PocoMacros.cmake +++ b/cmake/PocoMacros.cmake @@ -251,8 +251,10 @@ install( INCLUDES DESTINATION include ) +if (MSVC) # install the targets pdb -POCO_INSTALL_PDB(${target_name}) + POCO_INSTALL_PDB(${target_name}) +endif() endmacro() @@ -264,9 +266,6 @@ endmacro() # # This is an internal macro meant only to be used by POCO_INSTALL. macro(POCO_INSTALL_PDB target_name) - if (NOT MSVC) - return() - endif() get_property(type TARGET ${target_name} PROPERTY TYPE) if ("${type}" STREQUAL "SHARED_LIBRARY" OR "${type}" STREQUAL "EXECUTABLE")