cmake: $(CONFIGURATION) removed

- fixes #19 (build with ninja backend
nomacs · Nov 30, 2018 · 7effea1 · 7effea1
1 parent cec0be6
commit 7effea1
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/AffineTransformations/CMakeLists.txt b/AffineTransformations/CMakeLists.txt
@@ -55,7 +55,7 @@ ADD_DEFINITIONS(-DQT_DLL)
 # QT5_WRAP_CPP(PLUGIN_MOC_SRC ${PLUGIN_MOCS})
 QT5_ADD_RESOURCES(PLUGIN_RCC ${PLUGIN_RESOURCES})
 
-link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/$(CONFIGURATION) ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
+link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES} ${PLUGIN_MOC_SRC} ${PLUGIN_RCC} ${PLUGIN_HEADERS})	
 target_link_libraries(${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${OpenCV_LIBS} ${NOMACS_LIBS})
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Gui)

diff --git a/AffineTransformations/src/DkAffineTransformationsPlugin.json b/AffineTransformations/src/DkAffineTransformationsPlugin.json
@@ -3,7 +3,7 @@
 	"AuthorName" 	: "Tim Jerman",
 	"Company"		: "",
 	"DateCreated" 	: "2014-06-01",
-	"DateModified"	: "2018-11-21",
+	"DateModified"	: "2018-11-30",
 	"Description"	: "Apply affine transformations to the selected image. The available transformations are: scale, rotation (with automatic skewness detection), and shear.",
 	"Tagline" 	: "Transform and rotate images",
 	"PluginId"		: "7a4a50a45ddb408ba46a16a40e6518fd",

diff --git a/FakeMiniaturesPlugin/CMakeLists.txt b/FakeMiniaturesPlugin/CMakeLists.txt
@@ -50,7 +50,7 @@ ADD_DEFINITIONS(-DQT_DLL)
 # QT5_WRAP_CPP(PLUGIN_MOC_SRC ${PLUGIN_MOCS})
 QT5_ADD_RESOURCES(PLUGIN_RCC ${PLUGIN_RESOURCES})
 
-link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/$(CONFIGURATION) ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
+link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES} ${PLUGIN_MOC_SRC} ${PLUGIN_RCC} ${PLUGIN_HEADERS})	
 target_link_libraries(${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${OpenCV_LIBS} ${NOMACS_LIBS})
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Gui)

diff --git a/FakeMiniaturesPlugin/src/DkFakeMiniaturesPlugin.json b/FakeMiniaturesPlugin/src/DkFakeMiniaturesPlugin.json
@@ -3,7 +3,7 @@
 	"AuthorName" 	: "Tim Jerman",
 	"Company"		: "",
 	"DateCreated" 	: "2014-06-01",
-	"DateModified"	: "2018-11-21",
+	"DateModified"	: "2018-11-30",
 	"Description"	: "On the preview image select (by mouse click move and release) the region without blurring. A blur is applyied depending on the distance from this region. The amount of blur and saturation can be changed with the sliders on the right of the dialog.",
 	"Tagline" 		: "Apply a fake miniature filter (tilt shift effect) to the image.",
 	"PluginId"		: "a2ac7b68866b4ab29fb1df3e170b8f0d",

diff --git a/PageExtractionPlugin/CMakeLists.txt b/PageExtractionPlugin/CMakeLists.txt
@@ -52,7 +52,7 @@ ADD_DEFINITIONS(-DQT_DLL)
 
 QT5_ADD_RESOURCES(PLUGIN_RCC ${PLUGIN_RESOURCES})
 
-link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/$(CONFIGURATION) ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
+link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES} ${PLUGIN_MOC_SRC} ${PLUGIN_RCC} ${PLUGIN_HEADERS})	
 target_link_libraries(${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${OpenCV_LIBS} ${NOMACS_LIBS})
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Gui)

diff --git a/PageExtractionPlugin/src/DkPageExtractionPlugin.json b/PageExtractionPlugin/src/DkPageExtractionPlugin.json
@@ -3,7 +3,7 @@
 	"AuthorName" 	: "Markus Diem, Thomas Lang",
 	"Company"		: "Computer Vision Lab",
 	"DateCreated" 	: "2015-08-27",
-	"DateModified"	: "2018-11-21",
+	"DateModified"	: "2018-11-30",
 	"Description"	: "This plugin detects document pages and either crops the image accordingly or annotates the region.",
 	"Tagline" 		: "Detect document pages in images",
 	"PluginId"		: "4acb88c461024cb080ae5cd15d0ef0ec",

diff --git a/PaintPlugin/CMakeLists.txt b/PaintPlugin/CMakeLists.txt
@@ -47,7 +47,7 @@ ADD_DEFINITIONS(-DQT_DLL)
 
 QT5_ADD_RESOURCES(PLUGIN_RCC ${PLUGIN_RESOURCES})
 
-link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/$(CONFIGURATION) ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
+link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES} ${PLUGIN_MOC_SRC} ${PLUGIN_RCC} ${PLUGIN_HEADERS})	
 target_link_libraries(${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${OpenCV_LIBS} ${NOMACS_LIBS})
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Gui)

diff --git a/PaintPlugin/src/DkPaintPlugin.json b/PaintPlugin/src/DkPaintPlugin.json
@@ -3,7 +3,7 @@
 	"AuthorName" 	: "Tim Jerman",
 	"Company"		: "",
 	"DateCreated" 	: "2014-05-01",
-	"DateModified"	: "2018-11-21",
+	"DateModified"	: "2018-11-30",
 	"Description"	: "Paint on an image. The color, size and opacity of the brush can be changed.",
 	"Tagline" 		: "Draw with adjustable brushes to an image.",
 	"PluginId"		: "ad970ef36cc24737afd2b53ad015ff0d",

diff --git a/SIMPLE_PLUGIN/CMakeLists.txt b/SIMPLE_PLUGIN/CMakeLists.txt
@@ -49,7 +49,7 @@ ADD_DEFINITIONS(-DQT_DLL)
 
 QT5_ADD_RESOURCES(PLUGIN_RCC ${PLUGIN_RESOURCES})
 
-link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/$(CONFIGURATION) ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
+link_directories(${OpenCV_LIBRARY_DIRS} ${NOMACS_BUILD_DIRECTORY}/libs ${NOMACS_BUILD_DIRECTORY})
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES} ${PLUGIN_MOC_SRC} ${PLUGIN_RCC} ${PLUGIN_HEADERS})	
 target_link_libraries(${PROJECT_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTMAIN_LIBRARY} ${OpenCV_LIBS} ${NOMACS_LIBS})
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Gui)