Guard for misuse of python API, fix example that had a misuse, add -DNO_TCMALLOC in case of tcmalloc issue Signed-off-by: Alain <alainmarcel@yahoo.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt index 99aac62..82b66ef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt
@@ -48,8 +48,8 @@ endif(NOT NO_TCMALLOC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TCMALLOC_COMPILE_OPTIONS} ${MY_CXX_WARNING_FLAGS}") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TCMALLOC_COMPILE_OPTIONS} -O0 -g ${MY_CXX_WARNING_FLAGS}") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${TCMALLOC_COMPILE_OPTIONS} -O3 -DNDEBUG ${MY_CXX_WARNING_FLAGS}") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TCMALLOC_COMPILE_OPTIONS} -Wall -O0 -g ${MY_CXX_WARNING_FLAGS}") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${TCMALLOC_COMPILE_OPTIONS} -Wall -O3 -DNDEBUG ${MY_CXX_WARNING_FLAGS}") # Flatbuffer set(flatbuffer-GENERATED_SRC
diff --git a/src/SourceCompile/Compiler.cpp b/src/SourceCompile/Compiler.cpp index 6ed52ec..b47783e 100644 --- a/src/SourceCompile/Compiler.cpp +++ b/src/SourceCompile/Compiler.cpp
@@ -227,7 +227,6 @@ m_compilers.push_back(compiler); } } - return true; } @@ -254,6 +253,7 @@ std::cout << "Could not create filelist: " << fileList << std::endl; } } + return true; }
diff --git a/src/hellosureworld.cpp b/src/hellosureworld.cpp index c371b21..acfa963 100644 --- a/src/hellosureworld.cpp +++ b/src/hellosureworld.cpp
@@ -56,7 +56,7 @@ std::function<void(SURELOG::ModuleInstance*)> inst_visit = [&inst_visit](SURELOG::ModuleInstance* inst) { std::cout << "Inst: " << inst->getFullPathName() << std::endl; - for (auto i = 0; i < inst->getNbChildren(); i++) { + for (unsigned int i = 0; i < inst->getNbChildren(); i++) { inst_visit(inst->getChildren(i)); } };
diff --git a/tests/TestInstall/CMakeLists.txt b/tests/TestInstall/CMakeLists.txt index 1e593a1..f201c98 100644 --- a/tests/TestInstall/CMakeLists.txt +++ b/tests/TestInstall/CMakeLists.txt
@@ -28,10 +28,14 @@ set(CMAKE_BUILD_FILES_DIRECTORY ${dir}) set(CMAKE_BUILD_DIRECTORY ${dir}) -# C++ -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free ${MY_CXX_WARNING_FLAGS}") -set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -O0 -g ${MY_CXX_WARNING_FLAGS}") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -O3 -DNDEBUG ${MY_CXX_WARNING_FLAGS}") +# C++ Compilation line +if(NOT NO_TCMALLOC) + set (TCMALLOC_COMPILE_OPTIONS "-fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free") +endif(NOT NO_TCMALLOC) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TCMALLOC_COMPILE_OPTIONS} ${MY_CXX_WARNING_FLAGS}") +set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${TCMALLOC_COMPILE_OPTIONS} -Wall -O0 -g ${MY_CXX_WARNING_FLAGS}") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${TCMALLOC_COMPILE_OPTIONS} -Wall -O3 -DNDEBUG ${MY_CXX_WARNING_FLAGS}") set (INCLUDE_DIR "${INSTALL_DIR}/include/surelog/") @@ -39,7 +43,11 @@ set (LIB_DIR "${INSTALL_DIR}/lib/surelog/") -set (INSTALL_LIBRARIES_FOR_SURELOG -L${LIB_DIR} surelog antlr4-runtime flatbuffers +if(NOT NO_TCMALLOC) + set (TCMALLOC_LIBRARY tcmalloc) +endif(NOT NO_TCMALLOC) + +set (INSTALL_LIBRARIES_FOR_SURELOG -L${LIB_DIR} surelog antlr4-runtime ${TCMALLOC_LIBRARY} ${PYTHON_LIBRARIES} dl util m rt pthread tcmalloc )