Merge pull request #492 from commontk/make-sure-external-projects-update

Make sure external projects update

CMakeExternals/CTKData.cmake

@@ -46,7 +46,6 @@ if(NOT DEFINED CTKData_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ""
     INSTALL_COMMAND ""

CMakeExternals/DCMTK.cmake

@@ -52,7 +52,6 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     BUILD_COMMAND ""
     CMAKE_ARGS
       -DDCMTK_INSTALL_BINDIR:STRING=bin/${CMAKE_CFG_INTDIR}

CMakeExternals/ITK.cmake

@@ -53,7 +53,6 @@ if(NOT DEFINED ITK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeExternals/Log4Qt.cmake

@@ -47,7 +47,6 @@ if(NOT DEFINED Log4Qt_DIR)
     PREFIX ${proj}${ep_suffix}
     ${location_args}
     INSTALL_COMMAND ""
-    UPDATE_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE}

CMakeExternals/PythonQt.cmake

@@ -85,7 +85,6 @@ if(NOT DEFINED PYTHONQT_INSTALL_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     BUILD_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeExternals/QtSOAP.cmake

@@ -46,7 +46,6 @@ if(NOT DEFINED QtSOAP_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeExternals/QtTesting.cmake

@@ -56,7 +56,6 @@ if(NOT DEFINED QtTesting_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}
       -DBUILD_SHARED_LIBS:BOOL=ON

CMakeExternals/VTK.cmake

@@ -60,7 +60,6 @@ if(NOT DEFINED VTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeExternals/ZMQ.cmake

@@ -46,7 +46,6 @@ if(NOT DEFINED ZMQ_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeExternals/qRestAPI.cmake

@@ -46,7 +46,6 @@ if(NOT DEFINED ${proj}_DIR)
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     ${location_args}
-    UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     CMAKE_CACHE_ARGS
       ${ep_common_cache_args}

CMakeLists.txt

@@ -384,9 +384,7 @@ endif()
 if(UNIX AND NOT APPLE)
   include(ctkLinkerAsNeededFlagCheck)
   if(CTK_LINKER_NO_AS_NEEDED_FLAG_REQUIRED)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--no-as-needed"
-      CACHE STRING "Flags used by the linker"
-      FORCE)
+    set(CTK_EXE_LINKER_FLAGS "-Wl,--no-as-needed")
   endif()
 endif()
 
@@ -1077,6 +1075,8 @@ set(CTK_CONFIG_H_INCLUDE_DIR ${CTK_BINARY_DIR})
 set(CMAKE_CXX_FLAGS ${CTK_CXX_FLAGS} CACHE STRING "CMake C Flags" FORCE)
 set(CMAKE_C_FLAGS ${CTK_C_FLAGS} CACHE STRING "CMake CXX Flags" FORCE)
 
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS_INIT} ${CTK_EXE_LINKER_FLAGS}" CACHE STRING "Flags used when linking executables" FORCE)
+
 #-----------------------------------------------------------------------------
 # Set the header template which defines custom export/import macros
 # for shared libraries