fixed cmakelists.txt

tpaviot · tpaviot · commit 4f0cb367ba1f · 2017-06-02T06:27:37.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -204,7 +204,7 @@ if(WIN32)
     message(STATUS "Found MSVC compiler: ${MSVC} ${MSVC_VERSION}")
     set(LIBRARY_OUTPUT_PATH bin/)
     # prevent bigobj fatal error C1148 issue, and remove C4244 verbose warning
-    add_definitions("/bigobj /wd4244")
+    add_definitions("/bigobj /wd4244 /wd4251 /wd4275 /wd4290")
   elseif (BORLAND) # The compiler used is BORLAND
     set(LIBRARY_OUTPUT_PATH win${BIT}/bin/${CMAKE_BUILD_TYPE})
   else()
@@ -233,10 +233,8 @@ option_with_default(PYTHONOCC_WRAP_SMESH "Compile SMESH wrapper" FALSE)
 if(PYTHONOCC_WRAP_SMESH)
   include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/SMESH_Modules.cmake)
   # need boost headers to compile
-  #set(Boost_USE_STATIC_LIBS ON)
-  #find_package(Boost COMPONENTS filesystem thread)
-  #include_directories(${Boost_INCLUDE_DIRS})
-  include_directories(D:/Devel/smesh/boost-1.52.0)
+  find_package(Boost)
+  include_directories(${Boost_INCLUDE_DIRS})
   # need vtk headers to compile
   #find_package(VTK COMPONENTS vtkCommonCore vtkCommonDataModel vtkIOLegacy vtkFiltersVerdict)
   #include_directories(${VTK_INCLUDE_DIRS})
diff --git a/appveyor.yml b/appveyor.yml
@@ -90,7 +90,7 @@ test_script:
   # is set dynamically. This unfortunately mean that conda build --output
   # doesn't really work.
   #
-  - "%CMD_IN_ENV% conda build .\\ci\\conda --quiet --no-remove-work-dir"
+  - "%CMD_IN_ENV% conda build .\\ci\\conda --quiet --no-remove-work-dir --dirty"
   # move conda package to /dist
   - cmd: 'mkdir dist'
   - cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-%PYTHON_ARCH%\pythonocc*.bz2 dist || cmd /c "exit /b 0"'

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ test_script:`
`90`	`90`	`# is set dynamically. This unfortunately mean that conda build --output`
`91`	`91`	`# doesn't really work.`
`92`	`92`	`#`
`93`		`- - "%CMD_IN_ENV% conda build .\\ci\\conda --quiet --no-remove-work-dir"`
	`93`	`+ - "%CMD_IN_ENV% conda build .\\ci\\conda --quiet --no-remove-work-dir --dirty"`
`94`	`94`	`# move conda package to /dist`
`95`	`95`	`- cmd: 'mkdir dist'`
`96`	`96`	`- cmd: 'copy /Y %CONDA_INSTALL_LOCN%\conda-bld\win-%PYTHON_ARCH%\pythonocc*.bz2 dist \|\| cmd /c "exit /b 0"'`