瀏覽代碼

Merge pull request #514 from AndreasFetzer/fix-dcmtk-build-on-mac

Fix DCMTK build on mac
Jean-Christophe Fillion-Robin 10 年之前
父節點
當前提交
e234981d71
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      CMakeExternals/DCMTK.cmake

+ 2 - 2
CMakeExternals/DCMTK.cmake

@@ -52,7 +52,7 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     BINARY_DIR ${proj}-build
     BINARY_DIR ${proj}-build
     PREFIX ${proj}${ep_suffix}
     PREFIX ${proj}${ep_suffix}
     ${location_args}
     ${location_args}
-    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
     CMAKE_ARGS
     CMAKE_ARGS
       -DDCMTK_INSTALL_BINDIR:STRING=bin/${CMAKE_CFG_INTDIR}
       -DDCMTK_INSTALL_BINDIR:STRING=bin/${CMAKE_CFG_INTDIR}
       -DDCMTK_INSTALL_LIBDIR:STRING=lib/${CMAKE_CFG_INTDIR}
       -DDCMTK_INSTALL_LIBDIR:STRING=lib/${CMAKE_CFG_INTDIR}
@@ -72,7 +72,7 @@ if(NOT DEFINED DCMTK_DIR AND NOT ${CMAKE_PROJECT_NAME}_USE_SYSTEM_${proj})
     DEPENDS
     DEPENDS
       ${${proj}_DEPENDENCIES}
       ${${proj}_DEPENDENCIES}
     )
     )
-  set(DCMTK_DIR ${ep_install_dir})
+  set(DCMTK_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}-build)
 
 
 else()
 else()
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})
   ExternalProject_Add_Empty(${proj} DEPENDS ${${proj}_DEPENDENCIES})