File tree Expand file tree Collapse file tree 4 files changed +13
-8
lines changed Expand file tree Collapse file tree 4 files changed +13
-8
lines changed Original file line number Diff line number Diff line change 6
6
"cacheVariables" : {
7
7
"GUIToolkitsVariables_ROOT" : " $env{INSTALL_DIR}/guitoolkitsvariables" ,
8
8
"TkUtil_ROOT" : " $env{INSTALL_DIR}/tkutil" ,
9
- "TkUtilScripting_ROOT" : " $env{INSTALL_DIR}/tkutil" ,
10
- "USE_PYTHON_3" : " ON"
9
+ "TkUtilScripting_ROOT" : " $env{INSTALL_DIR}/tkutil"
11
10
}
12
11
}
13
12
]
14
13
}
15
-
14
+
Original file line number Diff line number Diff line change 4
4
5
5
set (PYTHON_UTIL_MAJOR_VERSION "6" )
6
6
set (PYTHON_UTIL_MINOR_VERSION "2" )
7
- set (PYTHON_UTIL_RELEASE_VERSION "2 " )
7
+ set (PYTHON_UTIL_RELEASE_VERSION "3 " )
8
8
set (PYTHON_UTIL_VERSION ${PYTHON_UTIL_MAJOR_VERSION} .${PYTHON_UTIL_MINOR_VERSION}.${PYTHON_UTIL_RELEASE_VERSION} )
9
9
Original file line number Diff line number Diff line change @@ -69,11 +69,11 @@ set (INCLUDE_INSTALL_DIR include/) # PythonUtil_INCLUDE_DIR avec PythonUtilConf
69
69
set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} ) # PythonUtil_LIB_DIR avec PythonUtilConfig.cmake.in
70
70
#set (RUNTIME_INSTALL_DIR bin/) # PythonUtil_RUNTIME_DIR avec PythonUtilConfig.cmake.in
71
71
72
- if (NOT USE_PYTHON_3 )
73
- set (REQUIRED_PYTHON Python2 )
74
- else (NOT USE_PYTHON_3 )
72
+ if (NOT USE_PYTHON_2 )
75
73
set (REQUIRED_PYTHON Python3 )
76
- endif (NOT USE_PYTHON_3 )
74
+ else (NOT USE_PYTHON_2 )
75
+ set (REQUIRED_PYTHON Python2 )
76
+ endif (NOT USE_PYTHON_2 )
77
77
78
78
# Création du fichier PythonUtilConfig.cmake qui définira PythonUtil_INCLUDE_DIR, PythonUtil_LIB_DIR et PythonUtil_BIN_DIR :
79
79
configure_package_config_file (cmake/${CMAKE_PACKAGE_CONFIG_NAME}.cmake.in ${CMAKE_PACKAGE_CONFIG_FILE}
Original file line number Diff line number Diff line change
1
+ Version 6.2.3 : 26/11/24
2
+ ===============
3
+
4
+ Python 3 par d�faut, sans demande explicite.
5
+
6
+
1
7
Version 6.2.2 : 13/12/23
2
8
===============
3
9
You can’t perform that action at this time.
0 commit comments