Skip to content

Commit b874fa7

Browse files
NoremosNoremos
committed
Fix build on some system
1 parent 4c3a1ce commit b874fa7

File tree

3 files changed

+1
-149
lines changed

3 files changed

+1
-149
lines changed

‎CMakeLists.txt‎

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,6 @@
11
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
2-
3-
set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
4-
52
project(Barcode CXX)
63

7-
################################################################################
8-
# Set target arch type if empty. Visual studio solution generator provides it.
9-
################################################################################
10-
if(NOT CMAKE_VS_PLATFORM_NAME AND CMAKE_CONFIGURATION_TYPES STREQ)
11-
set(CMAKE_VS_PLATFORM_NAME "x64")
12-
endif()
13-
message("${CMAKE_VS_PLATFORM_NAME} architecture in use")
14-
15-
if(NOT ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64"))
16-
message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} arch is not supported!")
17-
endif()
184

195
################################################################################
206
# Global configuration types
@@ -28,75 +14,6 @@ set(CMAKE_CONFIGURATION_TYPES
2814
CACHE STRING "" FORCE
2915
)
3016

31-
################################################################################
32-
# Global compiler options
33-
################################################################################
34-
if(MSVC)
35-
# remove default flags provided with CMake for MSVC
36-
set(CMAKE_CXX_FLAGS "")
37-
set(CMAKE_CXX_FLAGS_DEBUG "")
38-
set(CMAKE_CXX_FLAGS_DLL "")
39-
set(CMAKE_CXX_FLAGS_DLLCVLESS "")
40-
set(CMAKE_CXX_FLAGS_PYTHON37 "")
41-
set(CMAKE_CXX_FLAGS_PYTHON38 "")
42-
set(CMAKE_CXX_FLAGS_PYTHONDEBUG "")
43-
set(CMAKE_CXX_FLAGS_RELEASE "")
44-
set(CMAKE_CXX_FLAGS_STL "")
45-
set(CMAKE_CXX_FLAGS_STLCVLESS "")
46-
set(CMAKE_CXX_FLAGS_TEST "")
47-
endif()
48-
49-
################################################################################
50-
# Global linker options
51-
################################################################################
52-
if(MSVC)
53-
# remove default flags provided with CMake for MSVC
54-
set(CMAKE_EXE_LINKER_FLAGS "")
55-
set(CMAKE_MODULE_LINKER_FLAGS "")
56-
set(CMAKE_SHARED_LINKER_FLAGS "")
57-
set(CMAKE_STATIC_LINKER_FLAGS "")
58-
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}")
59-
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
60-
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
61-
set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
62-
set(CMAKE_EXE_LINKER_FLAGS_DLL "${CMAKE_EXE_LINKER_FLAGS}")
63-
set(CMAKE_MODULE_LINKER_FLAGS_DLL "${CMAKE_MODULE_LINKER_FLAGS}")
64-
set(CMAKE_SHARED_LINKER_FLAGS_DLL "${CMAKE_SHARED_LINKER_FLAGS}")
65-
set(CMAKE_STATIC_LINKER_FLAGS_DLL "${CMAKE_STATIC_LINKER_FLAGS}")
66-
set(CMAKE_EXE_LINKER_FLAGS_DLLCVLESS "${CMAKE_EXE_LINKER_FLAGS}")
67-
set(CMAKE_MODULE_LINKER_FLAGS_DLLCVLESS "${CMAKE_MODULE_LINKER_FLAGS}")
68-
set(CMAKE_SHARED_LINKER_FLAGS_DLLCVLESS "${CMAKE_SHARED_LINKER_FLAGS}")
69-
set(CMAKE_STATIC_LINKER_FLAGS_DLLCVLESS "${CMAKE_STATIC_LINKER_FLAGS}")
70-
set(CMAKE_EXE_LINKER_FLAGS_PYTHON37 "${CMAKE_EXE_LINKER_FLAGS}")
71-
set(CMAKE_MODULE_LINKER_FLAGS_PYTHON37 "${CMAKE_MODULE_LINKER_FLAGS}")
72-
set(CMAKE_SHARED_LINKER_FLAGS_PYTHON37 "${CMAKE_SHARED_LINKER_FLAGS}")
73-
set(CMAKE_STATIC_LINKER_FLAGS_PYTHON37 "${CMAKE_STATIC_LINKER_FLAGS}")
74-
set(CMAKE_EXE_LINKER_FLAGS_PYTHON38 "${CMAKE_EXE_LINKER_FLAGS}")
75-
set(CMAKE_MODULE_LINKER_FLAGS_PYTHON38 "${CMAKE_MODULE_LINKER_FLAGS}")
76-
set(CMAKE_SHARED_LINKER_FLAGS_PYTHON38 "${CMAKE_SHARED_LINKER_FLAGS}")
77-
set(CMAKE_STATIC_LINKER_FLAGS_PYTHON38 "${CMAKE_STATIC_LINKER_FLAGS}")
78-
set(CMAKE_EXE_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_EXE_LINKER_FLAGS}")
79-
set(CMAKE_MODULE_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
80-
set(CMAKE_SHARED_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
81-
set(CMAKE_STATIC_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
82-
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}")
83-
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}")
84-
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}")
85-
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}")
86-
set(CMAKE_EXE_LINKER_FLAGS_STL "${CMAKE_EXE_LINKER_FLAGS}")
87-
set(CMAKE_MODULE_LINKER_FLAGS_STL "${CMAKE_MODULE_LINKER_FLAGS}")
88-
set(CMAKE_SHARED_LINKER_FLAGS_STL "${CMAKE_SHARED_LINKER_FLAGS}")
89-
set(CMAKE_STATIC_LINKER_FLAGS_STL "${CMAKE_STATIC_LINKER_FLAGS}")
90-
set(CMAKE_EXE_LINKER_FLAGS_STLCVLESS "${CMAKE_EXE_LINKER_FLAGS}")
91-
set(CMAKE_MODULE_LINKER_FLAGS_STLCVLESS "${CMAKE_MODULE_LINKER_FLAGS}")
92-
set(CMAKE_SHARED_LINKER_FLAGS_STLCVLESS "${CMAKE_SHARED_LINKER_FLAGS}")
93-
set(CMAKE_STATIC_LINKER_FLAGS_STLCVLESS "${CMAKE_STATIC_LINKER_FLAGS}")
94-
set(CMAKE_EXE_LINKER_FLAGS_TEST "${CMAKE_EXE_LINKER_FLAGS}")
95-
set(CMAKE_MODULE_LINKER_FLAGS_TEST "${CMAKE_MODULE_LINKER_FLAGS}")
96-
set(CMAKE_SHARED_LINKER_FLAGS_TEST "${CMAKE_SHARED_LINKER_FLAGS}")
97-
set(CMAKE_STATIC_LINKER_FLAGS_TEST "${CMAKE_STATIC_LINKER_FLAGS}")
98-
endif()
99-
10017

10118
################################################################################
10219
# Common utils

‎PrjBarlib/CMakeLists.txt‎

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
cmake_minimum_required(VERSION 3.16.0 FATAL_ERROR)
22
project(Barcode CXX)
3-
set(CMAKE_VS_PLATFORM_NAME "x64")
43

54
# if(NOT OPENCV_BOOST AND (CMAKE_CONFIGURATION_TYPES STREQUAL "Python37" OR
65
# CMAKE_CONFIGURATION_TYPES STREQUAL "Python38" OR
@@ -20,71 +19,6 @@ set(CMAKE_CONFIGURATION_TYPES
2019
CACHE STRING "" FORCE
2120
)
2221

23-
################################################################################
24-
# Global compiler options
25-
################################################################################
26-
if(MSVC)
27-
# remove default flags provided with CMake for MSVC
28-
set(CMAKE_CXX_FLAGS "")
29-
set(CMAKE_CXX_FLAGS_DEBUG "")
30-
set(CMAKE_CXX_FLAGS_DLL "")
31-
set(CMAKE_CXX_FLAGS_PYTHON "")
32-
set(CMAKE_CXX_FLAGS_PYTHONDEBUG "")
33-
set(CMAKE_CXX_FLAGS_RELEASE "")
34-
set(CMAKE_CXX_FLAGS_TEST "")
35-
endif()
36-
37-
################################################################################
38-
# Global linker options
39-
################################################################################
40-
if(MSVC)
41-
# remove default flags provided with CMake for MSVC
42-
set(CMAKE_EXE_LINKER_FLAGS "")
43-
set(CMAKE_MODULE_LINKER_FLAGS "")
44-
set(CMAKE_SHARED_LINKER_FLAGS "")
45-
set(CMAKE_STATIC_LINKER_FLAGS "")
46-
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS}")
47-
set(CMAKE_MODULE_LINKER_FLAGS_DEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
48-
set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
49-
set(CMAKE_STATIC_LINKER_FLAGS_DEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
50-
set(CMAKE_EXE_LINKER_FLAGS_DLL "${CMAKE_EXE_LINKER_FLAGS}")
51-
set(CMAKE_MODULE_LINKER_FLAGS_DLL "${CMAKE_MODULE_LINKER_FLAGS}")
52-
set(CMAKE_SHARED_LINKER_FLAGS_DLL "${CMAKE_SHARED_LINKER_FLAGS}")
53-
set(CMAKE_STATIC_LINKER_FLAGS_DLL "${CMAKE_STATIC_LINKER_FLAGS}")
54-
set(CMAKE_EXE_LINKER_FLAGS_DLLCVLESS "${CMAKE_EXE_LINKER_FLAGS}")
55-
set(CMAKE_MODULE_LINKER_FLAGS_DLLCVLESS "${CMAKE_MODULE_LINKER_FLAGS}")
56-
set(CMAKE_SHARED_LINKER_FLAGS_DLLCVLESS "${CMAKE_SHARED_LINKER_FLAGS}")
57-
set(CMAKE_STATIC_LINKER_FLAGS_DLLCVLESS "${CMAKE_STATIC_LINKER_FLAGS}")
58-
set(CMAKE_EXE_LINKER_FLAGS_PYTHON37 "${CMAKE_EXE_LINKER_FLAGS}")
59-
set(CMAKE_MODULE_LINKER_FLAGS_PYTHON37 "${CMAKE_MODULE_LINKER_FLAGS}")
60-
set(CMAKE_SHARED_LINKER_FLAGS_PYTHON37 "${CMAKE_SHARED_LINKER_FLAGS}")
61-
set(CMAKE_STATIC_LINKER_FLAGS_PYTHON37 "${CMAKE_STATIC_LINKER_FLAGS}")
62-
set(CMAKE_EXE_LINKER_FLAGS_PYTHON38 "${CMAKE_EXE_LINKER_FLAGS}")
63-
set(CMAKE_MODULE_LINKER_FLAGS_PYTHON38 "${CMAKE_MODULE_LINKER_FLAGS}")
64-
set(CMAKE_SHARED_LINKER_FLAGS_PYTHON38 "${CMAKE_SHARED_LINKER_FLAGS}")
65-
set(CMAKE_STATIC_LINKER_FLAGS_PYTHON38 "${CMAKE_STATIC_LINKER_FLAGS}")
66-
set(CMAKE_EXE_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_EXE_LINKER_FLAGS}")
67-
set(CMAKE_MODULE_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_MODULE_LINKER_FLAGS}")
68-
set(CMAKE_SHARED_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_SHARED_LINKER_FLAGS}")
69-
set(CMAKE_STATIC_LINKER_FLAGS_PYTHONDEBUG "${CMAKE_STATIC_LINKER_FLAGS}")
70-
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS}")
71-
set(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS}")
72-
set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS}")
73-
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS}")
74-
set(CMAKE_EXE_LINKER_FLAGS_STL "${CMAKE_EXE_LINKER_FLAGS}")
75-
set(CMAKE_MODULE_LINKER_FLAGS_STL "${CMAKE_MODULE_LINKER_FLAGS}")
76-
set(CMAKE_SHARED_LINKER_FLAGS_STL "${CMAKE_SHARED_LINKER_FLAGS}")
77-
set(CMAKE_STATIC_LINKER_FLAGS_STL "${CMAKE_STATIC_LINKER_FLAGS}")
78-
set(CMAKE_EXE_LINKER_FLAGS_STLCVLESS "${CMAKE_EXE_LINKER_FLAGS}")
79-
set(CMAKE_MODULE_LINKER_FLAGS_STLCVLESS "${CMAKE_MODULE_LINKER_FLAGS}")
80-
set(CMAKE_SHARED_LINKER_FLAGS_STLCVLESS "${CMAKE_SHARED_LINKER_FLAGS}")
81-
set(CMAKE_STATIC_LINKER_FLAGS_STLCVLESS "${CMAKE_STATIC_LINKER_FLAGS}")
82-
set(CMAKE_EXE_LINKER_FLAGS_TEST "${CMAKE_EXE_LINKER_FLAGS}")
83-
set(CMAKE_MODULE_LINKER_FLAGS_TEST "${CMAKE_MODULE_LINKER_FLAGS}")
84-
set(CMAKE_SHARED_LINKER_FLAGS_TEST "${CMAKE_SHARED_LINKER_FLAGS}")
85-
set(CMAKE_STATIC_LINKER_FLAGS_TEST "${CMAKE_STATIC_LINKER_FLAGS}")
86-
endif()
87-
8822
################################################################################
8923
# Use solution folders feature
9024
################################################################################

‎PrjBarlib/include/barline.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <unordered_set>
1313
#include <stack>
1414
#include <limits.h>
15+
#include <algorithm>
1516
#endif
1617
MEXP namespace bc
1718
{

0 commit comments

Comments
 (0)