Windows build #78

simogasp · 2018-06-15T17:31:08Z

port the cpu part on windows (MSVC)
replace boost thread by std thread
replace custom code for backtrace with boost::stacktrace

avoid min max macro declaration

zvrba · 2018-06-17T07:46:34Z

src/cctag/utils/LogTime.cpp

@@ -17,7 +17,7 @@ bool Mgmt::Measurement::doPrint( ) const

 void Mgmt::Measurement::print( std::ostream& ostr ) const
 {
-    if( not _probe ) return;


It's not that windows doesn't support "not", it's that gcc and clang are too lax. You must include <iso646.h> to get and/not/etc. "keywords".

simogasp · 2018-06-17T11:22:54Z

Ah I thought they were like the other keywords, I didn't know they come/u need them from a header. That's cool then, personally I'd prefer to use `and not or` as they are more readable. I can revert the commit and just add the missing header if everybody agrees. @fabiencastan @griwodz @yann-lty

fabiencastan · 2018-06-18T08:57:26Z

That's cool then, personally I'd prefer to use and not or as they are more readable.

I would prefer to not mix multiple ways to do the same thing. We should use standard symbols as it's done everywhere in our libs.

But you can do it in Meshroom (in python) ;)

zvrba · 2018-06-21T07:46:16Z

I agree with Fabien, using and, or, etc. instead of standard symbols tends to obscure the code. It's not a well-known feature. (Actually, my guess is that they exist mainly to support non-ascii systems (EBCDIC) so you aren't forced to use digraphs or trigraphs.)

taken from here https://groups.google.com/forum/#!topic/snappy-compression/xzKxBNeAREc

for some reason vc complains, it's better to get rid of boost exception and use the stardard ones, i don't see the point

simogasp · 2019-07-05T07:07:30Z

INSTALL.md

@@ -20,12 +20,13 @@ $ git clone https://github.com/alicevision/CCTag.git
 Most of the dependencies can be installed from the common repositories (apt, yum etc):

 - Eigen3 (libeigen3-dev)
- Boost >= 1.53 ([core, thread, system, filesystem, serialization, thread, exception, chrono, date-time, program-options, timer]-dev)
+- Boost >= 1.53 ([accumulators, atomic, chrono, core, date-time, exception, filesystem, math, program-options, ptr-container, system, serialization, timer, thread]-dev)


stacktrace?

simogasp · 2019-07-05T07:08:35Z

CMakeLists.txt

 # Windows requires more work, and Mac is probably still hopeless.
-cmake_minimum_required(VERSION 3.4)
+# Version 3.14 is needed for boost-stacktrace
+cmake_minimum_required(VERSION 3.14)


3.14 is overkilling, 3.5 is the first one with Boost:boost targets

simogasp · 2019-07-05T07:10:38Z

src/CMakeLists.txt


  set(CUDA_cpp "")

  message( STATUS "Declare CCTag library" )
  add_library(CCTag ${CCTag_cpp})
  set_target_properties(CCTag PROPERTIES VERSION ${PROJECT_VERSION})

-  target_include_directories(CCTag 
+  target_include_directories(CCTag
                           PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>"
                                  "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
                           PUBLIC ${Boost_INCLUDE_DIRS} ${Eigen_INCLUDE_DIR} ${OpenCV_INCLUDE_DIRS}


${Boost_INCLUDE_DIRS} can now be removed. When you specify the target Boost::boost in target_link_libraries() it automagically add the relevant includes and definitions

simogasp · 2019-07-05T07:11:24Z

src/applications/CMakeLists.txt

@@ -1,12 +1,12 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.14)


Boost::stacktrace has been added in boost 1.65 ref and the FindBoost (versioned in CMake...) has been added in 3.13 ref. So I can eventually downgrade the requirement to 3.13.

simogasp · 2019-07-05T07:23:01Z

src/applications/CMakeLists.txt

+  ${OpenCV_LIBS}
+  Boost::filesystem Boost::timer
+  )
+
 if(IL_FOUND OR DevIL_FOUND)


maybe replace them with DevIL_FOUND

… on Windows

To be more coherent with the other parts. It was the only place where BOOST_THROW_EXCEPTION was used.

Needed to avoid build errors with boost exception and MSVC.

simogasp added 2 commits June 9, 2018 23:28

[cmake] add NOMINMAX flag for windows build

7642122

avoid min max macro declaration

[utils] update pcg to a recent version MSVC compliant

990f6a9

zvrba reviewed Jun 17, 2018

View reviewed changes

This was referenced Jun 20, 2018

Compatilibity with Boost 1.65 #79

Closed

vcpkg CCTag package #77

Closed

simogasp added type:feature scope:build type:enhancement in progress build:windows anything related to the windows build labels Jun 21, 2018

simogasp added 17 commits June 23, 2018 17:31

[cctag] unused includes

59d32b3

[utils] new definition for ssize_t

79d621d

taken from here https://groups.google.com/forum/#!topic/snappy-compression/xzKxBNeAREc

[cctag] fix float for hardcoded values

1769949

[utils] win does not support "not"

06746b3

[c++] variable size array not standard (only gcc/clang?)

4d0b39c

[cctag] use boost for M_PI

b7c711b

[cctag] std::numeric_limits<float>::max() instead of arbitrary value

c56da4c

[cctag] type coherence

36ee94f

[cctag] using std c++ exceptions

68cb46b

for some reason vc complains, it's better to get rid of boost exception and use the stardard ones, i don't see the point

[cctag] casting

22ed609

[utils] missing return statement

260595b

[cctag] using boost filesystem instead of posix to create directories

750f77a

[cctag] using struct for params, they were mixed between hpp and cpp

5a38092

[applications] using string() instead of native()

fb796ec

[applications] CmdLine using boost instead gnu getopt

7f97e00

[cmake] add option to build the application

444cf20

[ci] test build on appveyor

3a54fc7

fabiencastan added 6 commits July 4, 2019 15:10

[cmake] use boost TARGETS

237727d

[cmake] only use boost TARGETS

57033b7

[cmake] remove undefined boost targets

d2a34cc

[cmake] use only boost TARGETS

0331bec

[test] disable test_throw_repeated_points for now

0e9e8ed

[cmake] fix boost targets in applications

eb9f8c8

simogasp commented Jul 5, 2019

View reviewed changes

fabiencastan mentioned this pull request Jul 5, 2019

Add CCTag in all-in-one build alicevision/AliceVision#657

Merged

fabiencastan added 5 commits July 5, 2019 11:00

[cmake] fix USE_DEVIL define

b9dce30

Replace deprecated boost::timer

a480b9a

[cmake] add missing dep

93dc0eb

[travis] check build of applications in the global context

8fbd8bf

[doc] Update INSTALL.md requirements

b9106c5

fabiencastan approved these changes Jul 11, 2019

View reviewed changes

fabiencastan added 3 commits July 11, 2019 14:12

[doc] Readme: add Simone Gasparini to authors list

2b8a942

[doc] Update INSTALL.md: Cuda is optional and GPU part is problematic…

678dded

… on Windows

Use throw instead of BOOST_THROW_EXCEPTION

ee16bc5

To be more coherent with the other parts. It was the only place where BOOST_THROW_EXCEPTION was used.

fabiencastan force-pushed the devWindozeFixes branch 5 times, most recently from 4d2b9dc to ee16bc5 Compare July 16, 2019 11:16

[cmake] enable exception handling on windows

cdd97d2

Needed to avoid build errors with boost exception and MSVC.

fabiencastan force-pushed the devWindozeFixes branch from 4d2b9dc to cdd97d2 Compare July 16, 2019 11:18

fabiencastan merged commit 7768c18 into develop Jul 16, 2019

fabiencastan deleted the devWindozeFixes branch July 16, 2019 11:52

simogasp added this to the V1.0.0 milestone Jul 16, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Windows build #78

Windows build #78

simogasp commented Jun 15, 2018 •

edited by fabiencastan

Loading

zvrba Jun 17, 2018

simogasp commented Jun 17, 2018 via email •

edited

Loading

fabiencastan commented Jun 18, 2018

zvrba commented Jun 21, 2018 •

edited

Loading

simogasp Jul 5, 2019

simogasp Jul 5, 2019

simogasp Jul 5, 2019

simogasp Jul 5, 2019

fabiencastan Jul 5, 2019

simogasp Jul 5, 2019

		@@ -1,12 +1,12 @@
		cmake_minimum_required(VERSION 3.4)
		cmake_minimum_required(VERSION 3.14)

Windows build #78

Windows build #78

Conversation

simogasp commented Jun 15, 2018 • edited by fabiencastan Loading

zvrba Jun 17, 2018

Choose a reason for hiding this comment

simogasp commented Jun 17, 2018 via email • edited Loading

fabiencastan commented Jun 18, 2018

zvrba commented Jun 21, 2018 • edited Loading

simogasp Jul 5, 2019

Choose a reason for hiding this comment

simogasp Jul 5, 2019

Choose a reason for hiding this comment

simogasp Jul 5, 2019

Choose a reason for hiding this comment

simogasp Jul 5, 2019

Choose a reason for hiding this comment

fabiencastan Jul 5, 2019

Choose a reason for hiding this comment

simogasp Jul 5, 2019

Choose a reason for hiding this comment

simogasp commented Jun 15, 2018 •

edited by fabiencastan

Loading

simogasp commented Jun 17, 2018 via email •

edited

Loading

zvrba commented Jun 21, 2018 •

edited

Loading