blueloveTH 1 an în urmă
părinte
comite
0844dbaff3
1 a modificat fișierele cu 2 adăugiri și 12 ștergeri
  1. 2 12
      CMakeLists.txt

+ 2 - 12
CMakeLists.txt

@@ -11,12 +11,12 @@ if(MSVC)
 
 
     if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ox")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /Ox")
+        add_definitions(-DNDEBUG)
     endif()
     endif()
 else()
 else()
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
-
     if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
     if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2")
+        add_definitions(-DNDEBUG)
     endif()
     endif()
 
 
     # disable -Wshorten-64-to-32 for apple
     # disable -Wshorten-64-to-32 for apple
@@ -28,12 +28,6 @@ endif()
 include_directories(${CMAKE_CURRENT_LIST_DIR}/include)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/include)
 file(GLOB_RECURSE POCKETPY_SRC ${CMAKE_CURRENT_LIST_DIR}/src/*.c)
 file(GLOB_RECURSE POCKETPY_SRC ${CMAKE_CURRENT_LIST_DIR}/src/*.c)
 
 
-# option(PK_USE_CJSON "" OFF)
-# if(PK_USE_CJSON)
-#     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rd/cjson)
-#     add_definitions(-DPK_USE_CJSON)
-# endif()
-
 option(PK_ENABLE_OS "" OFF)
 option(PK_ENABLE_OS "" OFF)
 if(PK_ENABLE_OS)
 if(PK_ENABLE_OS)
     add_definitions(-DPK_ENABLE_OS=1)
     add_definitions(-DPK_ENABLE_OS=1)
@@ -85,10 +79,6 @@ else()
     target_link_libraries(${PROJECT_EXE_NAME} ${PROJECT_NAME})
     target_link_libraries(${PROJECT_EXE_NAME} ${PROJECT_NAME})
 endif()
 endif()
 
 
-if(PK_USE_CJSON)
-    target_link_libraries(${PROJECT_NAME} PRIVATE cjson)
-endif()
-
 # link math library
 # link math library
 if(UNIX)
 if(UNIX)
     target_link_libraries(${PROJECT_NAME} PRIVATE m)
     target_link_libraries(${PROJECT_NAME} PRIVATE m)