rebuilding

yssource · Feb 23, 2022 · cc343ce · cc343ce
1 parent f72bfef
commit cc343ce
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 34 deletions.
diff --git a/abquant.profile b/abquant.profile
@@ -20,9 +20,9 @@ qt:with_dbus=True
 # *: cmake/3.20.3, ninja/1.10.2
 
 [env]
-// CC="ccache clang"
-// CXX="ccache clang++"
-// CPP="ccache cpp"
+# CC="ccache clang"
+# CXX="ccache clang++"
+# CPP="ccache cpp"
 CC="clang"
 CXX="clang++"
 CPP="cpp"

diff --git a/binding/abquant/CMakeLists.txt b/binding/abquant/CMakeLists.txt
@@ -11,9 +11,9 @@
 set(binding_library "pyabquant")
 set(pyabquant_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 

diff --git a/binding/emconceptbase/CMakeLists.txt b/binding/emconceptbase/CMakeLists.txt
@@ -9,12 +9,11 @@
 # The name of the generated bindings module (as imported in Python). You can change the name
 # to something relevant for your project.
 set(binding_library "pyabqemconceptbase")
-
 set(pyabqemconceptbase_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 

diff --git a/binding/emconcepthistory/CMakeLists.txt b/binding/emconcepthistory/CMakeLists.txt
@@ -9,15 +9,12 @@
 # The name of the generated bindings module (as imported in Python). You can change the name
 # to something relevant for your project.
 set(binding_library "pyabqemconcepthistory")
-
-# set(CMAKE_CXX_FLAGS_RELEASE "-O0")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_SQL_LIB")
-
 set(pyabqemconcepthistory_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 

diff --git a/binding/indexday/CMakeLists.txt b/binding/indexday/CMakeLists.txt
@@ -9,13 +9,11 @@
 # The name of the generated bindings module (as imported in Python). You can change the name
 # to something relevant for your project.
 set(binding_library "pyabqindexday")
-
 set(pyabqindexday_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
-
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 

diff --git a/binding/indexmin/CMakeLists.txt b/binding/indexmin/CMakeLists.txt
@@ -9,19 +9,11 @@
 # The name of the generated bindings module (as imported in Python). You can change the name
 # to something relevant for your project.
 set(binding_library "pyabqindexmin")
-
-# set(CMAKE_CXX_FLAGS_RELEASE "-O0")
-# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_SQL_LIB")
-
 set(pyabqindexmin_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
-# set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.a;/usr/lib/libtreefrog.so")
-# set(core_libraries "${abquant_lib_dir}/libabqcontroller.a;${abquant_lib_dir}/libabqhelper.a;${abquant_lib_dir}/libabqmodel.a;${abquant_lib_dir}/libabqaction.a;/usr/lib/libtreefrog.so")
-
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 

diff --git a/binding/securitylist/CMakeLists.txt b/binding/securitylist/CMakeLists.txt
@@ -9,12 +9,11 @@
 # The name of the generated bindings module (as imported in Python). You can change the name
 # to something relevant for your project.
 set(binding_library "pyabqsecuritylist")
-
 set(pyabqsecuritylist_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 # =============================== CMake target - binding_library =============================

diff --git a/binding/stockday/CMakeLists.txt b/binding/stockday/CMakeLists.txt
@@ -11,9 +11,9 @@
 set(binding_library "pyabqstockday")
 set(pyabqstockday_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 

diff --git a/binding/stockmin/CMakeLists.txt b/binding/stockmin/CMakeLists.txt
@@ -11,9 +11,9 @@
 set(binding_library "pyabqstockmin")
 set(pyabqstockmin_include_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../cxx/include)
 set(tree_includes  "/usr/include/treefrog/")
-# set(tree_lib "/usr/lib/libtreefrog.so")
+set(tf_lib "/usr/lib/libtreefrog.so")
 set(abquant_lib_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib)
-set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;/usr/lib/libtreefrog.so")
+set(core_libraries "${abquant_lib_dir}/libabqcontroller.so;${abquant_lib_dir}/libabqhelper.so;${abquant_lib_dir}/libabqmodel.so;${abquant_lib_dir}/libabqaction.so;${tf_lib}")
 set(binding_library_dir ${CMAKE_CURRENT_SOURCE_DIR}/../../lib/)
 
 

diff --git a/cxx/abqbase.pri b/cxx/abqbase.pri
@@ -41,3 +41,4 @@ INSTALLS += target
 
 CONFIG += conan_basic_setup
 include($$TOP_BUILD_DIR/conanbuildinfo.pri)
+LIBS -= $$CONAN_LIBS_QT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,3 +41,4 @@ INSTALLS += target

		CONFIG += conan_basic_setup
		include($$TOP_BUILD_DIR/conanbuildinfo.pri)
		LIBS -= $$CONAN_LIBS_QT