Mercurial > hg > orthanc-stl

comparison Resources/CMake/LibVtkConfiguration.cmake @ 17:961d7f13759e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trying to replace <CONFIG> by ${CMAKE_BUILD_TYPE} for macOS
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 12 Sep 2023 07:11:50 +0200
parents 609ba59d1c54
children 78db385dddf1
comparison
equal deleted inserted replaced
16:609ba59d1c54 17:961d7f13759e
69 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} 69 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
70 -DCMAKE_CXX_COMPILER=g++ 70 -DCMAKE_CXX_COMPILER=g++
71 -DCMAKE_C_COMPILER=gcc 71 -DCMAKE_C_COMPILER=gcc
72 72
73 BUILD_COMMAND 73 BUILD_COMMAND
74 ${CMAKE_COMMAND} --build <BINARY_DIR> --config <CONFIG> --parallel ${NumberOfPhysicalCores} -t 74 ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE} --parallel ${NumberOfPhysicalCores} -t
75 VTKCompileToolsConfig.cmake 75 VTKCompileToolsConfig.cmake
76 76
77 INSTALL_COMMAND "" # Skip the install step 77 INSTALL_COMMAND "" # Skip the install step
78 ) 78 )
79 79
147 "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} ${Flags}" 147 "-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS} ${Flags}"
148 -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} 148 -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
149 -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} 149 -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
150 150
151 BUILD_COMMAND 151 BUILD_COMMAND
152 ${CMAKE_COMMAND} --build <BINARY_DIR> --config <CONFIG> --parallel ${NumberOfPhysicalCores} -t 152 ${CMAKE_COMMAND} --build <BINARY_DIR> --config ${CMAKE_BUILD_TYPE} --parallel ${NumberOfPhysicalCores} -t
153 vtkCommonCore 153 vtkCommonCore
154 vtkCommonDataModel 154 vtkCommonDataModel
155 vtkCommonMath 155 vtkCommonMath
156 vtkCommonMisc 156 vtkCommonMisc
157 vtkCommonSystem 157 vtkCommonSystem
194 endforeach() 194 endforeach()
195 195
196 ExternalProject_Get_Property(VTK binary_dir) 196 ExternalProject_Get_Property(VTK binary_dir)
197 ExternalProject_Get_Property(VTK source_dir) 197 ExternalProject_Get_Property(VTK source_dir)
198 198
199 if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") 199 link_directories(${binary_dir}/lib)
200 # TODO - This looks very strange
201 link_directories(${binary_dir}/../Debug)
202 else()
203 link_directories(${binary_dir}/lib)
204 endif()
205 200
206 foreach(dir IN ITEMS 201 foreach(dir IN ITEMS
207 Common/Core 202 Common/Core
208 Common/DataModel 203 Common/DataModel
209 Common/ExecutionModel 204 Common/ExecutionModel