aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/cmake/FindVPP.cmake20
-rw-r--r--src/plugins/CMakeLists.txt12
3 files changed, 17 insertions, 17 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f3183cd..4888114 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
# set compiler options
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99")
+set(CMAKE_C_FLAGS "-Wall -std=gnu99")
set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2")
set(CMAKE_C_FLAGS_DEBUG "-g -O0")
diff --git a/src/cmake/FindVPP.cmake b/src/cmake/FindVPP.cmake
index b010154..3f229dc 100644
--- a/src/cmake/FindVPP.cmake
+++ b/src/cmake/FindVPP.cmake
@@ -159,15 +159,15 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS)
${CMAKE_INSTALL_PREFIX}/lib
)
- find_library(VOM_LIBRARY
- NAMES
- vom
- libvom
- PATHS
- ${VPP_LIBRARY_PATH}
- ${CMAKE_LIBRARY_PATH}
- ${CMAKE_INSTALL_PREFIX}/lib
- )
+# find_library(VOM_LIBRARY
+# NAMES
+# vom
+# libvom
+# PATHS
+# ${VPP_LIBRARY_PATH}
+# ${CMAKE_LIBRARY_PATH}
+# ${CMAKE_INSTALL_PREFIX}/lib
+# )
if (VPP_INCLUDE_DIR AND VPP_LIBRARY)
set(VPP_FOUND TRUE)
@@ -191,7 +191,7 @@ else (VPP_LIBRARIES AND VPP_INCLUDE_DIRS)
${VLIB_LIBRARY}
${VATPLUGIN_LIBRARY}
${VAPI_LIBRARY}
- ${VOM_LIBRARY}
+# ${VOM_LIBRARY}
)
# show the VPP_INCLUDE_DIRS and VPP_LIBRARIES variables only in the advanced view
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index b347989..08003f7 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -11,18 +11,18 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
-# set compiler options
+
+cmake_minimum_required(VERSION 2.8)
+project(sysrepo-vpp-plugins)
+
+# set compiler option
set(CMAKE_EXPORT_COMPILE_COMMANDS 1)
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99")
+set(CMAKE_C_FLAGS "-Wall -std=gnu99")
set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -O2")
set(CMAKE_C_FLAGS_DEBUG "-g -O0")
set (CMAKE_INSTALL_LIBDIR "/usr/lib")
-cmake_minimum_required(VERSION 2.8)
-project(sysrepo-vpp-plugins)
-
# Cmake find modules
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/../cmake")